Merge change 22871 into eclair

* changes:
  More InetAddress fixes.