Merge branch 'stable-3.6'

* stable-3.6:
  Fix issues with Flogger formatting string not being constant

Change-Id: Ic9fa194cb595b1126a35baf6b7ac0a2d1e6c3cc2
diff --git a/src/main/java/com/googlesource/gerrit/modules/cache/chroniclemap/H2MigrationServlet.java b/src/main/java/com/googlesource/gerrit/modules/cache/chroniclemap/H2MigrationServlet.java
index 58a34e1..c93e44e 100644
--- a/src/main/java/com/googlesource/gerrit/modules/cache/chroniclemap/H2MigrationServlet.java
+++ b/src/main/java/com/googlesource/gerrit/modules/cache/chroniclemap/H2MigrationServlet.java
@@ -171,8 +171,8 @@
     }
 
     logger.atInfo().log("Migrating H2 caches to Chronicle-Map...");
-    logger.atInfo().log("* Size multiplier: %s", sizeMultiplier);
-    logger.atInfo().log("* Max Bloat Factor: %s", maxBloatFactor);
+    logger.atInfo().log("* Size multiplier: %d", sizeMultiplier);
+    logger.atInfo().log("* Max Bloat Factor: %d", maxBloatFactor);
 
     Config outputChronicleMapConfig = new Config();