Merge branch 'stable-2.7' into stable-2.8

* stable-2.7:
  Fix commit-msg hint to actually work

Conflicts:
	gerrit-server/src/main/java/com/google/gerrit/server/git/validators/CommitValidators.java

Change-Id: I4b8d6c0d265d015f45fd31cb1fd284e32b7985eb