Merge "Improve SMTP client error messages" into stable-2.5