Merge branch 'stable-3.0' into stable-3.1 * stable-3.0: Upgrade javamelody-core to 1.85.0 Change-Id: I5e2803deea56e92b9c605839bd01d7a80bb88411