Merge "Minimal support for IPv6 upstreams in IpServer tests." am: fc7d7b5f0f

Change-Id: If0f89231a74da9f38fc1ba19f914a7d4e359f9e3