am 4b5092ae: Merge "Fix SSLContextTest.test_SSLContext_defaultConfiguration failure"

* commit '4b5092ae80e4c3681080090eebd63a82d65eafd9':
  Fix SSLContextTest.test_SSLContext_defaultConfiguration failure