Merge "Fix SSLContextTest.test_SSLContext_defaultConfiguration failure"