Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Add an empty tools/BUILD file explicitly for Bazel

Change-Id: I4381c4df778ff9613ad43b833d8ed7fcb3648357

WORKSPACE

diff --git a/WORKSPACE b/WORKSPACE
index 058b0e4..39f12c3 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "577450c73780560972f8a1a92c91410192ff7224",
+    commit = "8ac9d00b8f12b7f61ff360c47a5bd87d7f75f4b5",
     #local_path = "/home/<user>/projects/bazlets",
 )
 

src/test/java/com/googlesource/gerrit/plugins/readonly/AbstractReadOnlyTest.java

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 43cc3a3..e24137f 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());