Merge "Minimal support for IPv6 upstreams in IpServer tests." am: fc7d7b5f0f am: 21d63cba5b am: 954d0c274f

Change-Id: Iba46592442663cdc9b69aa2c5cb1ea0893f8f087