Merge changes I11334802,I769518d1

* changes:
  More SOCK_DESTROY test work
  Add code and tests to close sockets via SOCK_DESTROY.