Merge "Don't assume default network names in net_ip*map" into stable/ocata