Merge branch 'stable-3.1' * stable-3.1: Upgrade javamelody-core to 1.83.0 Change-Id: If155082cf58d283c865f2961774c768509951e35