Merge branch 'stable-2.4'
By Colby Ranger (4) and others
via gerrit code review (3) and Shawn O. Pearce (1)
* stable-2.4:
Do not execute rejected commands
Honor the sendmail.smtpUser from gerrit.config on upgrade
Fix deadlock on destroy of CommandFactoryProvider.
Use AtomicBoolean for "logged" in CommandFactoryProvider.
Fix lockup of '/COMMIT_MSG' file from patch set
Catch all exceptions when async emailing.
Fixed cleanup of propagated SshScopes
Conflicts:
gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java
gerrit-sshd/src/main/java/com/google/gerrit/sshd/CommandFactoryProvider.java
gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshScope.java
Change-Id: Ia67f33ee5bd8a33917221df5cf9c8287913bd99c
