Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  Upgrade javamelody-core to 1.85.0

Change-Id: I5e2803deea56e92b9c605839bd01d7a80bb88411

external_plugin_deps.bzl

diff --git a/external_plugin_deps.bzl b/external_plugin_deps.bzl
index 72ef670..56845fa 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.83.0",
-        sha1 = "850a51ed7887b6f3b8388e25ba86adf15e5da52a",
+        artifact = "net.bull.javamelody:javamelody-core:1.85.0",
+        sha1 = "c3ba19e7ee1727d015bb9fc5ab806118b71873bc",
     )
 
     maven_jar(