Merge: Issue #11927: SMTP_SSL now uses port 465 by default as documented.

diff --cc Lib/smtplib.py
Simple merge

diff --cc Misc/ACKS
Simple merge

diff --cc Misc/NEWS
index 2d56431366b64fbe969c80e4455bd8ccc243db8e,7fe9376ff99184a5a97ac7a18ef7c571273908b0..212b72cab37981e5d5e06d704b47139a0a5acb8f
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -140,9 -83,9 +140,12 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #11927: SMTP_SSL now uses port 465 by default as documented.  Patch
+   by Kasun Herath.
+ 
 +- Issue 11916: Add a number of MacOSX specific definitions to the errno module.
 +  Patch by Pierre Carrier.
 +
  - Issue 11999: fixed sporadic sync failure mailbox.Maildir due to its trying to
    detect mtime changes by comparing to the system clock instead of to the
    previous value of the mtime.