Merge branch 'stable-3.1' into stable-3.2

* stable-3.1:
  Upgrade javamelody-core to 1.87.0
  Upgrade bazlets to latest stable-3.1 to build with 3.1.12 API
  Upgrade bazlets to latest stable-3.1 to build with 3.1.11 API

Change-Id: I03e380865685a63d4f5ee606c29ccfb4aefe2d98
diff --git a/external_plugin_deps.bzl b/external_plugin_deps.bzl
index f5acb1c..e06bebe 100644
--- a/external_plugin_deps.bzl
+++ b/external_plugin_deps.bzl
@@ -3,8 +3,8 @@
 def external_plugin_deps():
     maven_jar(
         name = "javamelody-core",
-        artifact = "net.bull.javamelody:javamelody-core:1.86.0",
-        sha1 = "9aa8fc685238ba3391c5e163a451d52bb254387a",
+        artifact = "net.bull.javamelody:javamelody-core:1.87.0",
+        sha1 = "4173735d9a29f1ab54f4dbd6081e18f5b45cdfc3",
     )
 
     maven_jar(