Merge "Minimal support for IPv6 upstreams in IpServer tests."