Merge "Assorted socket fixes related to test_SSLSocket_setSoWriteTimeout failure investigation"