Merge change 2920

* changes:
  Make native socket code address-independent in preparation for IPv6 support.