Merge change I7e695ea9

* changes:
  Remove duplication in OpenSSLSocket/OpenSSLServerSocket.