Fix the socket tests so they can be run concurrently.  Backport candidate
5 files changed