send(), ehlo(): Integrate patch #487310 by Fazal Majid.  Consistently call self.close() just before raising SMTPServerDisconnected.  This allows you to, e.g. reconnect after a server timeout.
send(), ehlo(): Integrate patch #487310 by Fazal Majid.  Consistently
call self.close() just before raising SMTPServerDisconnected.  This
allows you to, e.g. reconnect after a server timeout.

Merged from the 2.2c1 branch.

sk-/python2.7-type-annotator,sk-/python2.7-type-annotator,sk-/python2.7-type-annotator