Merge changes Ib1510f36,I8a2f50da,Ife74d135,Idfb19903

* changes:
  Refactor TCP test code into its own file.
  Move some sock_diag tests around.
  Teach more sock_diag code and tests about mapped sockets.
  Delete the hack that finds mapped sockets.