Merge branch 'stable-2.15'

* stable-2.15:
  Document how to add custom plugin(s) to eclipse project
  Document how to bundle custom plugins in release.war
  Document that core plugins are bundled in release.war
  Fix merging change by direct push
  Fix docs to say labels are laid out alphabetically

Change-Id: I998d369718680d34124dc8e493b05d14e2c3079e

Documentation/config-labels.txt

@@ -166,9 +166,7 @@ name as in the parent.
 [[label_layout]]
 === Layout
 
-Labels are laid out in the order they are specified in project.config,
-with inherited labels appearing first, providing some layout control to
-the administrator.
+Labels are laid out in alphabetical order.
 
 [[label_name]]
 === `label.Label-Name`

Documentation/dev-bazel.txt

@@ -35,7 +35,7 @@ The output executable WAR will be placed in:
 === Gerrit Release WAR File
 
 To build the Gerrit web application that includes the GWT UI, the
-PolyGerrit UI and documentation:
+PolyGerrit UI, core plugins and documentation:
 
 ----
   bazel build release

Documentation/dev-build-plugins.txt

@@ -95,6 +95,38 @@ def external_plugin_deps():
   )
 ----
 
+=== Bundle custom plugin in release.war ===
+
+To bundle custom plugin(s) in the link:dev-bazel.html#release[release.war] artifact,
+add them to the CUSTOM_PLUGINS list in `tools/bzl/plugins.bzl`.
+
+Example of `tools/bzl/plugins.bzl` with custom plugin `my-plugin`:
+
+----
+CORE_PLUGINS = [
+    "commit-message-length-validator",
+    "download-commands",
+    "hooks",
+    "replication",
+    "reviewnotes",
+    "singleusergroup",
+]
+
+CUSTOM_PLUGINS = [
+    "my-plugin",
+]
+
+CUSTOM_PLUGINS_TEST_DEPS = [
+    # Add custom core plugins with tests deps here
+]
+----
+
+[NOTE]
+Since `tools/bzl/plugins.bzl` is part of Gerrit's source code and the version
+of the war is based on the state of the git repository that is built; you should
+commit this change before building, otherwise the version will be marked as
+'dirty'.
+
 == Bazel standalone driven
 
 Only few plugins support that mode for now:

Documentation/dev-eclipse.txt

@@ -42,6 +42,13 @@ that get saved to the `.project` file, for example adding Resource
 Filters on a folder, they will be overwritten the next time you run
 `tools/eclipse/project.py`.
 
+=== Eclipse project with custom plugins ===
+
+To add custom plugins to the eclipse project add them to `tools/bzl/plugins.bzl`
+the same way you would when
+link:dev-build-plugins.html#_bundle_custom_plugin_in_release_war[bundling in release.war]
+and run `tools/eclipse/project.py`.
+
 
 [[Formatting]]
 == Code Formatter Settings

java/com/google/gerrit/server/git/receive/ReceiveCommits.java

@@ -2950,7 +2950,11 @@ class ReceiveCommits {
       throws OrmException {
     Map<Change.Key, ChangeNotes> r = new HashMap<>();
     for (ChangeData cd : queryProvider.get().byBranchOpen(branch)) {
-      r.put(cd.change().getKey(), cd.notes());
+      try {
+        r.put(cd.change().getKey(), cd.notes());
+      } catch (NoSuchChangeException e) {
+        //Ignore deleted change
+      }
     }
     return r;
   }