Merge change 25160 into eclair

* changes:
  Make getHostByAddr and getHostByName return the proper object type.