Merge branch 'stable-2.11'

* stable-2.11:
  Inline edit: Strip trailing blank lines from commit messages
  Tweak JS clipboard API integration to work on Firefox
  Include server config module in init step
  JarScanner: Fix minor typo in log message
  Silence meaningless warnings from JarScanner

Change-Id: Ie928190f4c8f31a1bbfcc640b5c7a9f4109de5ff

gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/BaseInit.java

@@ -28,6 +28,7 @@ import com.google.gerrit.pgm.init.api.InitFlags;
 import com.google.gerrit.pgm.init.api.InstallPlugins;
 import com.google.gerrit.pgm.util.SiteProgram;
 import com.google.gerrit.reviewdb.server.ReviewDb;
+import com.google.gerrit.server.config.GerritServerConfigModule;
 import com.google.gerrit.server.config.SitePath;
 import com.google.gerrit.server.config.SitePaths;
 import com.google.gerrit.server.git.GitRepositoryManager;
@@ -222,6 +223,7 @@ public class BaseInit extends SiteProgram {
       throw die(err);
     }
 
+    m.add(new GerritServerConfigModule());
     m.add(new InitModule(standalone, initDb));
     m.add(new AbstractModule() {
       @Override