Merge changes Ib0ab1722,Id5b1b351

* changes:
  Don't create TIME-WAIT sockets in CreateSocketPair.
  Add support for the sock_diag netlink interface.