Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Http: fix generation of the custom readonly message
  Upgrade bazlets to latest stable-2.16 to build with 2.16.18 API
  Bump Bazel version to 3.1.0

Change-Id: I30c7e4454740e0e73c7d759a7a7854bfc0b937ed
diff --git a/WORKSPACE b/WORKSPACE
index 9952e2e..c1fbb1c 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "855968156ecd58d422218d6b5c9872805df9e9fc",
+    commit = "97eef86854b0fb68b9287831f3075b6f6218ff41",
     #local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/src/test/java/com/googlesource/gerrit/plugins/readonly/AbstractReadOnlyTest.java b/src/test/java/com/googlesource/gerrit/plugins/readonly/AbstractReadOnlyTest.java
index d680abd..56be07a 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/readonly/AbstractReadOnlyTest.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/readonly/AbstractReadOnlyTest.java
@@ -135,7 +135,7 @@
     String url = ssh ? adminSshSession.getUrl() : admin.getHttpUrl(server);
     if (!ssh) {
       CredentialsProvider.setDefault(
-          new UsernamePasswordCredentialsProvider(admin.username, admin.httpPassword));
+          new UsernamePasswordCredentialsProvider(admin.username(), admin.httpPassword()));
     }
     testRepo = GitUtil.cloneProject(project, url + "/" + project.get());