Merge "SmtpSender: Send EHLO that adheres to RFC2821"