Merge branch 'stable-2.8'

* stable-2.8:
  Fixed the spelling of together and very minor rewording
  Fixed the spelling of indefinitely.
  Performance Fix: Minimize number of advertisedHaves
  Add 'reindex' to the pgm help output.

gerrit-launcher/src/main/java/com/google/gerrit/launcher/GerritLauncher.java

@@ -67,6 +67,7 @@ public final class GerritLauncher {
       System.err.println();
       System.err.println("The most commonly used commands are:");
       System.err.println("  init           Initialize a Gerrit installation");
+      System.err.println("  reindex        Rebuild the secondary index");
       System.err.println("  daemon         Run the Gerrit network daemons");
       System.err.println("  gsql           Run the interactive query console");
       System.err.println("  version        Display the build version number");