Merge "Improve dumping IPv4 map entries."