Merge "Honor the sendmail.smtpUser from gerrit.config on upgrade"