Merge "Remove unneeded net_ip_map dump into hieradata"