Merge branch 'stable-2.8'
* stable-2.8:
Fix Merge Always and Merge If Necessary strategies
Fix formatting problem in buck documentation
Buck: Expand instructions related to setting up the path
Conflicts:
Documentation/dev-buck.txt
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/SubmitByMergeAlwaysIT.java
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/SubmitByMergeIfNecessaryIT.java
Change-Id: I56fd7f427d9d4bd5c1ec5c37ab5e744065cfd3b9
