MFC r258821 - fix tcp simultaneous close

PR:             kern/99188
Merged r260415 from head.

Approved by:	davidch
Revert MFC of r258821 - it was already handled by MFC of r239672.

Pointy hat to: peter