[MERGE] Handle SMTP connection errors nicely, especially if default used

[John Arbash Meinel]

John Arbash Meinel has voted approve.
Status is now: Approved
Comment:
Probably needs to wait until after the current rc1 is released.

For details, see: 
http://bundlebuggy.aaronbentley.com/request/%3CE1IJXSs-00066d-00%40server4.panoramicfeedback.com%3E