Merge branch 'stable-2.8' into stable-2.9

* stable-2.8:
  Executing CherryPick.writeCherryPickCommit() in a transaction.
  Bump API version to 2.8.6
  Release notes for Gerrit 2.8.6
  Add missing 'link:' in 2.8.5 release notes
  ChangeMergeQueue: Fix race condition

Conflicts:
	VERSION
	gerrit-plugin-archetype/pom.xml
	gerrit-plugin-gwt-archetype/pom.xml
	gerrit-plugin-gwtui/pom.xml
	gerrit-plugin-js-archetype/pom.xml
	gerrit-server/src/main/java/com/google/gerrit/server/git/strategy/CherryPick.java

Change-Id: I06fba0020457de66f68ac2b5675e9d57bf75d750

ReleaseNotes/ReleaseNotes-2.8.5.txt

@@ -73,7 +73,7 @@ ssh
 
 * Upgrade SSHD to version 0.11.0.
 +
-Fixes https://code.google.com/p/gerrit/issues/detail?id=2406[Issue 2406]:
+Fixes link:https://code.google.com/p/gerrit/issues/detail?id=2406[Issue 2406]:
 "git clone" hangs after 100% resolving deltas with git over SSH.
 +
 Fixes a number of other issues including a

ReleaseNotes/ReleaseNotes-2.8.6.txt

@@ -0,0 +1,23 @@
+Release notes for Gerrit 2.8.6
+==============================
+
+There are no schema changes from link:ReleaseNotes-2.8.5.html[2.8.5].
+
+Download:
+link:https://gerrit-releases.storage.googleapis.com/gerrit-2.8.6.war[
+https://gerrit-releases.storage.googleapis.com/gerrit-2.8.6.war]
+
+
+Bug Fixes
+---------
+
+* link:https://code.google.com/p/gerrit/issues/detail?id=2034[Issue 2034],
+link:https://code.google.com/p/gerrit/issues/detail?id=2383[Issue 2383],
+link:https://code.google.com/p/gerrit/issues/detail?id=2702[Issue 2702]:
+Fix race condition in change merge queue.
++
+There was a race in the merge queue between changes submitted via
+the UI, and merges scheduled by the background merge queue reload.
++
+This resulted in multiple submit actions being scheduled, leading
+to corrupt changes.

ReleaseNotes/index.txt

@@ -9,6 +9,7 @@ Version 2.9.x
 [[2_8]]
 Version 2.8.x
 -------------
+* link:ReleaseNotes-2.8.6.html[2.8.6]
 * link:ReleaseNotes-2.8.5.html[2.8.5]
 * link:ReleaseNotes-2.8.4.html[2.8.4]
 * link:ReleaseNotes-2.8.3.html[2.8.3]

VERSION

@@ -3,4 +3,3 @@
 # when talking to the destination repository.
 #
 GERRIT_VERSION = '2.9-SNAPSHOT'
-

gerrit-server/src/main/java/com/google/gerrit/server/git/ChangeMergeQueue.java

@@ -148,9 +148,11 @@ public class ChangeMergeQueue implements MergeQueue {
     if (e == null) {
       e = new MergeEntry(branch);
       active.put(branch, e);
+      e.needMerge = true;
+      scheduleJob(e);
+    } else {
+      e.needMerge = true;
     }
-    e.needMerge = true;
-    scheduleJob(e);
   }
 
   @Override