Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  Prepare for new gerrit_api snapshot version usage
  Upgrade bazlets to latest stable-3.0
  Upgrade bazlets to latest stable-3.0

Change-Id: I444b917842949a395739c599de2ce6198b29acf2

WORKSPACE

diff --git a/WORKSPACE b/WORKSPACE
index a5e2886..38abfc6 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -35,20 +35,13 @@
     repository = GERRIT,
 )
 
-# Release Plugin API
 load(
     "@com_googlesource_gerrit_bazlets//:gerrit_api.bzl",
     "gerrit_api",
 )
 
-# Snapshot Plugin API
-#load(
-#    "@com_googlesource_gerrit_bazlets//:gerrit_api_maven_local.bzl",
-#    "gerrit_api_maven_local",
-#)
-
 # Load release Plugin API
 gerrit_api()
 
 # Load snapshot Plugin API
-#gerrit_api_maven_local()
+#gerrit_api(version = "3.0.xy-SNAPSHOT")