Merge branch 'stable-2.8'

* stable-2.8:
  Fix cherry pick of multiple changes
  Fix typos in 2.8.2 release notes

Conflicts:
	gerrit-server/src/main/java/com/google/gerrit/server/git/strategy/CherryPick.java

Change-Id: Ib12351af322e8934f17909a56181e8953977c840