Merge branch 'stable-2.13'

* stable-2.13:
  Gerrit command line utility to set/update secure.config
  Fix naming and message prompt for entering passwords
  Don't truncate long lines in diff screens

Change-Id: I2210d94e0bc7374eff26614145e3a76b526177f5

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

@@ -82,6 +82,8 @@ public final class GerritLauncher {
       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");
+      System.err.println("  passwd          Set or change password in secure.config");
+
       System.err.println();
       System.err.println("  ls              List files available for cat");
       System.err.println("  cat FILE        Display a file from the archive");