Merge change 22845 into eclair

* changes:
  IPv6 fixes to java.net.InetAddress.