Merge socketserver fixes from 3.5 into 3.6

Lib/test/ssl_servers.py

@@ -16,7 +16,7 @@ here = os.path.dirname(__file__)
 HOST = support.HOST
 CERTFILE = os.path.join(here, 'keycert.pem')
 
-# This one's based on HTTPServer, which is based on SocketServer
+# This one's based on HTTPServer, which is based on socketserver
 
 class HTTPSServer(_HTTPServer):
 

Lib/test/test_ssl.py

@@ -2734,7 +2734,7 @@ if _have_threads:
                     s.close()
 
         def test_socketserver(self):
-            """Using a SocketServer to create and manage SSL connections."""
+            """Using socketserver to create and manage SSL connections."""
             server = make_https_server(self, certfile=CERTFILE)
             # try to connect
             if support.verbose:

Misc/NEWS

@@ -4952,7 +4952,7 @@ Library
 
 - Issue #18643: Add socket.socketpair() on Windows.
 
-- Issue #22435: Fix a file descriptor leak when SocketServer bind fails.
+- Issue #22435: Fix a file descriptor leak when socketserver bind fails.
 
 - Issue #13096: Fixed segfault in CTypes POINTER handling of large
   values.