Merge branch 'stable-2.10'

Conflicts:
	gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ReviewCommand.java

Change-Id: I64ca4005da7d3c676954b4da397e5c9566c934a1