Merge changes I035cd9b6,I8ca9f205

* changes:
  Make the SOCK_DESTROY tests work again.
  Make CloseSocketFromFd work on mapped sockets too.