Merge branch 'stable-3.6' into stable-3.7

* stable-3.6:
  Deleting a project that has no entry shouldn't cause a split brain
  Fix compilation error for missing variable
  Fix CompileTimeConstant ErrorProne issue

Change-Id: I8f92b31356cdd1fb4bb32b3e0fe166373406bada

src/main/java/com/googlesource/gerrit/plugins/validation/dfsrefdb/zookeeper/ZookeeperConfig.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/validation/dfsrefdb/zookeeper/ZookeeperConfig.java b/src/main/java/com/googlesource/gerrit/plugins/validation/dfsrefdb/zookeeper/ZookeeperConfig.java
index 117dead..aa62862 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/validation/dfsrefdb/zookeeper/ZookeeperConfig.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/validation/dfsrefdb/zookeeper/ZookeeperConfig.java
@@ -176,7 +176,10 @@
     sslTrustStorePassword =
         getOptionalString(zkConfig, SECTION, SUBSECTION, SSL_TRUSTSTORE_PASSWORD);
 
-    checkArgument(StringUtils.isNotEmpty(connectionString), "zookeeper.%s contains no servers");
+    checkArgument(
+        StringUtils.isNotEmpty(connectionString),
+        "zookeeper.%s contains no servers",
+        connectionString);
   }
 
   public CuratorFramework buildCurator() {