Merge branch 'stable-2.9' into stable-2.10

* stable-2.9:
  Add full names for options on list groups REST API
  Add full names for options on list projects REST API
  Make `-S` an alias of `--start` in changes query REST API
  Mention deprecation of sortkey parameters in 2.9 release notes
  Run change hooks and ref-updated events after indexing is done.
  Fix broken formatting in changes REST documentation
  Restrict the input of plugin_archetype_deploy.sh
  Gracefully handle `buck audit` failure
  Revert "Make VisibleRefFilter.Filter reuse the refs passed from JGit."

Conflicts:
	gerrit-server/src/main/java/com/google/gerrit/server/change/PutTopic.java
	gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java
	tools/pack_war.py

Change-Id: I89a9b42c049ec1365ef6dec53c73c7a10a41e888

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

@@ -859,6 +859,7 @@ public class MergeOp {
       db.commit();
 
       sendMergedEmail(c, submitter);
+      indexer.index(db, c);
       if (submitter != null) {
         try {
           hooks.doChangeMergedHook(c,
@@ -1085,6 +1086,14 @@ public class MergeOp {
       }
     }));
 
+    if (indexFuture != null) {
+      try {
+        indexFuture.checkedGet();
+      } catch (IOException e) {
+        log.error("Failed to index new change message", e);
+      }
+    }
+
     if (submitter != null) {
       try {
         hooks.doMergeFailedHook(c,
@@ -1094,13 +1103,6 @@ public class MergeOp {
         log.error("Cannot run hook for merge failed " + c.getId(), ex);
       }
     }
-    if (indexFuture != null) {
-      try {
-        indexFuture.checkedGet();
-      } catch (IOException e) {
-        log.error("Failed to index new change message", e);
-      }
-    }
   }
 
   private void abandonAllOpenChanges() throws NoSuchChangeException {
@@ -1166,4 +1168,4 @@ public class MergeOp {
     }
     update.commit();
   }
-}
+}