Merge branch 'stable-2.10'

* stable-2.10:
  Update replication plugin
  Bump gwtorm to 1.14 - solves the primary key column order bug
  Buck: Package servlet-api in WEB-INF/pgm-lib again
  Update replication plugin to latest revision
  Update JGit to version 3.5.1.201410131835-r
  Fix ordering of 2.9.x releases in the release notes index.
  Disable Gitweb for in-memory acceptance tests
  Allow to raise BooleanQuery limit in gerrit.config.
  Fix comment box font colors of dark CM themes

Conflicts:
	gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/HttpPushForReviewIT.java
	lib/jgit/BUCK

Change-Id: I18307ca165dd5b2ca476b053fc75779bc17712bf

gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneChangeIndex.java

@@ -74,6 +74,7 @@ import org.apache.lucene.index.IndexWriterConfig;
 import org.apache.lucene.index.IndexWriterConfig.OpenMode;
 import org.apache.lucene.index.IndexableField;
 import org.apache.lucene.index.Term;
+import org.apache.lucene.search.BooleanQuery;
 import org.apache.lucene.search.IndexSearcher;
 import org.apache.lucene.search.Query;
 import org.apache.lucene.search.ScoreDoc;
@@ -256,6 +257,9 @@ public class LuceneChangeIndex implements ChangeIndex {
             CUSTOM_CHAR_MAPPING);
     queryBuilder = new QueryBuilder(schema, analyzer);
 
+    BooleanQuery.setMaxClauseCount(cfg.getInt("index", "defaultMaxClauseCount",
+        BooleanQuery.getMaxClauseCount()));
+
     GerritIndexWriterConfig openConfig =
         new GerritIndexWriterConfig(luceneVersion, cfg, "changes_open");
     GerritIndexWriterConfig closedConfig =