Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Set XSRF on '/' under PolyGerrit

Change-Id: Ia3da453253c84a8e04fce42f188dbcb700da0b1e

java/com/google/gerrit/httpd/raw/StaticModule.java

@@ -247,8 +247,8 @@ public class StaticModule extends ServletModule {
     public void configureServlets() {
       for (String p : POLYGERRIT_INDEX_PATHS) {
         // Skip XsrfCookieFilter for /, since that is already done in the GWT UI
-        // path (UrlModule).
-        if (!p.equals("/")) {
+        // path (UrlModule) if it is enabled.
+        if (!(p.equals("/") && options.enableGwtUi())) {
           filter(p).through(XsrfCookieFilter.class);
         }
       }