Merge branch '1.1.x' into 1.2.x

# Conflicts:
#	benchmarks/benchmarks-core/gradle/dependency-locks/compileClasspath.lockfile
#	implementations/micrometer-registry-appoptics/gradle/dependency-locks/compile.lockfile
#	implementations/micrometer-registry-appoptics/gradle/dependency-locks/compileClasspath.lockfile
#	implementations/micrometer-registry-appoptics/gradle/dependency-locks/default.lockfile
#	implementations/micrometer-registry-appoptics/gradle/dependency-locks/runtime.lockfile
#	implementations/micrometer-registry-appoptics/gradle/dependency-locks/runtimeClasspath.lockfile
#	implementations/micrometer-registry-appoptics/gradle/dependency-locks/testCompile.lockfile
#	implementations/micrometer-registry-appoptics/gradle/dependency-locks/testCompileClasspath.lockfile
#	implementations/micrometer-registry-appoptics/gradle/dependency-locks/testRuntime.lockfile
#	implementations/micrometer-registry-appoptics/gradle/dependency-locks/testRuntimeClasspath.lockfile
#	implementations/micrometer-registry-atlas/gradle/dependency-locks/compile.lockfile
#	implementations/micrometer-registry-atlas/gradle/dependency-locks/compileClasspath.lockfile
#	implementations/micrometer-registry-atlas/gradle/dependency-locks/default.lockfile
#	implementations/micrometer-registry-atlas/gradle/dependency-locks/runtime.lockfile
#	implementations/micrometer-registry-atlas/gradle/dependency-locks/runtimeClasspath.lockfile
#	implementations/micrometer-registry-atlas/gradle/dependency-locks/testCompile.lockfile
#	implementations/micrometer-registry-atlas/gradle/dependency-locks/testCompileClasspath.lockfile
#	implementations/micrometer-registry-atlas/gradle/dependency-locks/testRuntime.lockfile
#	implementations/micrometer-registry-atlas/gradle/dependency-locks/testRuntimeClasspath.lockfile
#	implementations/micrometer-registry-azure-monitor/gradle/dependency-locks/compile.lockfile
#	implementations/micrometer-registry-azure-monitor/gradle/dependency-locks/compileClasspath.lockfile
#	implementations/micrometer-registry-azure-monitor/gradle/dependency-locks/default.lockfile
#	implementations/micrometer-registry-azure-monitor/gradle/dependency-locks/runtime.lockfile
#	implementations/micrometer-registry-azure-monitor/gradle/dependency-locks/runtimeClasspath.lockfile
#	implementations/micrometer-registry-azure-monitor/gradle/dependency-locks/testCompile.lockfile
#	implementations/micrometer-registry-azure-monitor/gradle/dependency-locks/testCompileClasspath.lockfile
#	implementations/micrometer-registry-azure-monitor/gradle/dependency-locks/testRuntime.lockfile
#	implementations/micrometer-registry-azure-monitor/gradle/dependency-locks/testRuntimeClasspath.lockfile
#	implementations/micrometer-registry-cloudwatch/gradle/dependency-locks/compile.lockfile
#	implementations/micrometer-registry-cloudwatch/gradle/dependency-locks/compileClasspath.lockfile
#	implementations/micrometer-registry-cloudwatch/gradle/dependency-locks/default.lockfile
#	implementations/micrometer-registry-cloudwatch/gradle/dependency-locks/runtime.lockfile
#	implementations/micrometer-registry-cloudwatch/gradle/dependency-locks/runtimeClasspath.lockfile
#	implementations/micrometer-registry-cloudwatch/gradle/dependency-locks/testCompile.lockfile
#	implementations/micrometer-registry-cloudwatch/gradle/dependency-locks/testCompileClasspath.lockfile
#	implementations/micrometer-registry-cloudwatch/gradle/dependency-locks/testRuntime.lockfile
#	implementations/micrometer-registry-cloudwatch/gradle/dependency-locks/testRuntimeClasspath.lockfile
#	implementations/micrometer-registry-datadog/gradle/dependency-locks/compile.lockfile
#	implementations/micrometer-registry-datadog/gradle/dependency-locks/compileClasspath.lockfile
#	implementations/micrometer-registry-datadog/gradle/dependency-locks/default.lockfile
#	implementations/micrometer-registry-datadog/gradle/dependency-locks/runtime.lockfile
#	implementations/micrometer-registry-datadog/gradle/dependency-locks/runtimeClasspath.lockfile
#	implementations/micrometer-registry-datadog/gradle/dependency-locks/testCompile.lockfile
#	implementations/micrometer-registry-datadog/gradle/dependency-locks/testCompileClasspath.lockfile
#	implementations/micrometer-registry-datadog/gradle/dependency-locks/testRuntime.lockfile
#	implementations/micrometer-registry-datadog/gradle/dependency-locks/testRuntimeClasspath.lockfile
#	implementations/micrometer-registry-dynatrace/gradle/dependency-locks/compile.lockfile
#	implementations/micrometer-registry-dynatrace/gradle/dependency-locks/compileClasspath.lockfile
#	implementations/micrometer-registry-dynatrace/gradle/dependency-locks/default.lockfile
#	implementations/micrometer-registry-dynatrace/gradle/dependency-locks/runtime.lockfile
#	implementations/micrometer-registry-dynatrace/gradle/dependency-locks/runtimeClasspath.lockfile
#	implementations/micrometer-registry-dynatrace/gradle/dependency-locks/testCompile.lockfile
#	implementations/micrometer-registry-dynatrace/gradle/dependency-locks/testCompileClasspath.lockfile
#	implementations/micrometer-registry-dynatrace/gradle/dependency-locks/testRuntime.lockfile
#	implementations/micrometer-registry-dynatrace/gradle/dependency-locks/testRuntimeClasspath.lockfile
#	implementations/micrometer-registry-elastic/gradle/dependency-locks/compile.lockfile
#	implementations/micrometer-registry-elastic/gradle/dependency-locks/compileClasspath.lockfile
#	implementations/micrometer-registry-elastic/gradle/dependency-locks/default.lockfile
#	implementations/micrometer-registry-elastic/gradle/dependency-locks/runtime.lockfile
#	implementations/micrometer-registry-elastic/gradle/dependency-locks/runtimeClasspath.lockfile
#	implementations/micrometer-registry-elastic/gradle/dependency-locks/testCompile.lockfile
#	implementations/micrometer-registry-elastic/gradle/dependency-locks/testCompileClasspath.lockfile
#	implementations/micrometer-registry-elastic/gradle/dependency-locks/testRuntime.lockfile
#	implementations/micrometer-registry-elastic/gradle/dependency-locks/testRuntimeClasspath.lockfile
#	implementations/micrometer-registry-ganglia/gradle/dependency-locks/compile.lockfile
#	implementations/micrometer-registry-ganglia/gradle/dependency-locks/compileClasspath.lockfile
#	implementations/micrometer-registry-ganglia/gradle/dependency-locks/default.lockfile
#	implementations/micrometer-registry-ganglia/gradle/dependency-locks/runtime.lockfile
#	implementations/micrometer-registry-ganglia/gradle/dependency-locks/runtimeClasspath.lockfile
#	implementations/micrometer-registry-ganglia/gradle/dependency-locks/testCompile.lockfile
#	implementations/micrometer-registry-ganglia/gradle/dependency-locks/testCompileClasspath.lockfile
#	implementations/micrometer-registry-ganglia/gradle/dependency-locks/testRuntime.lockfile
#	implementations/micrometer-registry-ganglia/gradle/dependency-locks/testRuntimeClasspath.lockfile
#	implementations/micrometer-registry-graphite/gradle/dependency-locks/compile.lockfile
#	implementations/micrometer-registry-graphite/gradle/dependency-locks/compileClasspath.lockfile
#	implementations/micrometer-registry-graphite/gradle/dependency-locks/default.lockfile
#	implementations/micrometer-registry-graphite/gradle/dependency-locks/runtime.lockfile
#	implementations/micrometer-registry-graphite/gradle/dependency-locks/runtimeClasspath.lockfile
#	implementations/micrometer-registry-graphite/gradle/dependency-locks/testCompile.lockfile
#	implementations/micrometer-registry-graphite/gradle/dependency-locks/testCompileClasspath.lockfile
#	implementations/micrometer-registry-graphite/gradle/dependency-locks/testRuntime.lockfile
#	implementations/micrometer-registry-graphite/gradle/dependency-locks/testRuntimeClasspath.lockfile
#	implementations/micrometer-registry-humio/gradle/dependency-locks/compile.lockfile
#	implementations/micrometer-registry-humio/gradle/dependency-locks/compileClasspath.lockfile
#	implementations/micrometer-registry-humio/gradle/dependency-locks/default.lockfile
#	implementations/micrometer-registry-humio/gradle/dependency-locks/runtime.lockfile
#	implementations/micrometer-registry-humio/gradle/dependency-locks/runtimeClasspath.lockfile
#	implementations/micrometer-registry-humio/gradle/dependency-locks/testCompile.lockfile
#	implementations/micrometer-registry-humio/gradle/dependency-locks/testCompileClasspath.lockfile
#	implementations/micrometer-registry-humio/gradle/dependency-locks/testRuntime.lockfile
#	implementations/micrometer-registry-humio/gradle/dependency-locks/testRuntimeClasspath.lockfile
#	implementations/micrometer-registry-influx/gradle/dependency-locks/compile.lockfile
#	implementations/micrometer-registry-influx/gradle/dependency-locks/compileClasspath.lockfile
#	implementations/micrometer-registry-influx/gradle/dependency-locks/default.lockfile
#	implementations/micrometer-registry-influx/gradle/dependency-locks/runtime.lockfile
#	implementations/micrometer-registry-influx/gradle/dependency-locks/runtimeClasspath.lockfile
#	implementations/micrometer-registry-influx/gradle/dependency-locks/testCompile.lockfile
#	implementations/micrometer-registry-influx/gradle/dependency-locks/testCompileClasspath.lockfile
#	implementations/micrometer-registry-influx/gradle/dependency-locks/testRuntime.lockfile
#	implementations/micrometer-registry-influx/gradle/dependency-locks/testRuntimeClasspath.lockfile
#	implementations/micrometer-registry-jmx/gradle/dependency-locks/compile.lockfile
#	implementations/micrometer-registry-jmx/gradle/dependency-locks/compileClasspath.lockfile
#	implementations/micrometer-registry-jmx/gradle/dependency-locks/default.lockfile
#	implementations/micrometer-registry-jmx/gradle/dependency-locks/runtime.lockfile
#	implementations/micrometer-registry-jmx/gradle/dependency-locks/runtimeClasspath.lockfile
#	implementations/micrometer-registry-jmx/gradle/dependency-locks/testCompile.lockfile
#	implementations/micrometer-registry-jmx/gradle/dependency-locks/testCompileClasspath.lockfile
#	implementations/micrometer-registry-jmx/gradle/dependency-locks/testRuntime.lockfile
#	implementations/micrometer-registry-jmx/gradle/dependency-locks/testRuntimeClasspath.lockfile
#	implementations/micrometer-registry-kairos/gradle/dependency-locks/compile.lockfile
#	implementations/micrometer-registry-kairos/gradle/dependency-locks/compileClasspath.lockfile
#	implementations/micrometer-registry-kairos/gradle/dependency-locks/default.lockfile
#	implementations/micrometer-registry-kairos/gradle/dependency-locks/runtime.lockfile
#	implementations/micrometer-registry-kairos/gradle/dependency-locks/runtimeClasspath.lockfile
#	implementations/micrometer-registry-kairos/gradle/dependency-locks/testCompile.lockfile
#	implementations/micrometer-registry-kairos/gradle/dependency-locks/testCompileClasspath.lockfile
#	implementations/micrometer-registry-kairos/gradle/dependency-locks/testRuntime.lockfile
#	implementations/micrometer-registry-kairos/gradle/dependency-locks/testRuntimeClasspath.lockfile
#	implementations/micrometer-registry-new-relic/gradle/dependency-locks/compile.lockfile
#	implementations/micrometer-registry-new-relic/gradle/dependency-locks/compileClasspath.lockfile
#	implementations/micrometer-registry-new-relic/gradle/dependency-locks/default.lockfile
#	implementations/micrometer-registry-new-relic/gradle/dependency-locks/runtime.lockfile
#	implementations/micrometer-registry-new-relic/gradle/dependency-locks/runtimeClasspath.lockfile
#	implementations/micrometer-registry-new-relic/gradle/dependency-locks/testCompile.lockfile
#	implementations/micrometer-registry-new-relic/gradle/dependency-locks/testCompileClasspath.lockfile
#	implementations/micrometer-registry-new-relic/gradle/dependency-locks/testRuntime.lockfile
#	implementations/micrometer-registry-new-relic/gradle/dependency-locks/testRuntimeClasspath.lockfile
#	implementations/micrometer-registry-prometheus/gradle/dependency-locks/compile.lockfile
#	implementations/micrometer-registry-prometheus/gradle/dependency-locks/compileClasspath.lockfile
#	implementations/micrometer-registry-prometheus/gradle/dependency-locks/default.lockfile
#	implementations/micrometer-registry-prometheus/gradle/dependency-locks/runtime.lockfile
#	implementations/micrometer-registry-prometheus/gradle/dependency-locks/runtimeClasspath.lockfile
#	implementations/micrometer-registry-prometheus/gradle/dependency-locks/testCompile.lockfile
#	implementations/micrometer-registry-prometheus/gradle/dependency-locks/testCompileClasspath.lockfile
#	implementations/micrometer-registry-prometheus/gradle/dependency-locks/testRuntime.lockfile
#	implementations/micrometer-registry-prometheus/gradle/dependency-locks/testRuntimeClasspath.lockfile
#	implementations/micrometer-registry-signalfx/gradle/dependency-locks/compile.lockfile
#	implementations/micrometer-registry-signalfx/gradle/dependency-locks/compileClasspath.lockfile
#	implementations/micrometer-registry-signalfx/gradle/dependency-locks/default.lockfile
#	implementations/micrometer-registry-signalfx/gradle/dependency-locks/runtime.lockfile
#	implementations/micrometer-registry-signalfx/gradle/dependency-locks/runtimeClasspath.lockfile
#	implementations/micrometer-registry-signalfx/gradle/dependency-locks/testCompile.lockfile
#	implementations/micrometer-registry-signalfx/gradle/dependency-locks/testCompileClasspath.lockfile
#	implementations/micrometer-registry-signalfx/gradle/dependency-locks/testRuntime.lockfile
#	implementations/micrometer-registry-signalfx/gradle/dependency-locks/testRuntimeClasspath.lockfile
#	implementations/micrometer-registry-stackdriver/gradle/dependency-locks/compile.lockfile
#	implementations/micrometer-registry-stackdriver/gradle/dependency-locks/compileClasspath.lockfile
#	implementations/micrometer-registry-stackdriver/gradle/dependency-locks/default.lockfile
#	implementations/micrometer-registry-stackdriver/gradle/dependency-locks/runtime.lockfile
#	implementations/micrometer-registry-stackdriver/gradle/dependency-locks/runtimeClasspath.lockfile
#	implementations/micrometer-registry-stackdriver/gradle/dependency-locks/testCompile.lockfile
#	implementations/micrometer-registry-stackdriver/gradle/dependency-locks/testCompileClasspath.lockfile
#	implementations/micrometer-registry-stackdriver/gradle/dependency-locks/testRuntime.lockfile
#	implementations/micrometer-registry-stackdriver/gradle/dependency-locks/testRuntimeClasspath.lockfile
#	implementations/micrometer-registry-statsd/gradle/dependency-locks/compile.lockfile
#	implementations/micrometer-registry-statsd/gradle/dependency-locks/compileClasspath.lockfile
#	implementations/micrometer-registry-statsd/gradle/dependency-locks/default.lockfile
#	implementations/micrometer-registry-statsd/gradle/dependency-locks/runtime.lockfile
#	implementations/micrometer-registry-statsd/gradle/dependency-locks/runtimeClasspath.lockfile
#	implementations/micrometer-registry-statsd/gradle/dependency-locks/testCompile.lockfile
#	implementations/micrometer-registry-statsd/gradle/dependency-locks/testCompileClasspath.lockfile
#	implementations/micrometer-registry-statsd/gradle/dependency-locks/testRuntime.lockfile
#	implementations/micrometer-registry-statsd/gradle/dependency-locks/testRuntimeClasspath.lockfile
#	implementations/micrometer-registry-wavefront/gradle/dependency-locks/compile.lockfile
#	implementations/micrometer-registry-wavefront/gradle/dependency-locks/compileClasspath.lockfile
#	implementations/micrometer-registry-wavefront/gradle/dependency-locks/default.lockfile
#	implementations/micrometer-registry-wavefront/gradle/dependency-locks/runtime.lockfile
#	implementations/micrometer-registry-wavefront/gradle/dependency-locks/runtimeClasspath.lockfile
#	implementations/micrometer-registry-wavefront/gradle/dependency-locks/testCompile.lockfile
#	implementations/micrometer-registry-wavefront/gradle/dependency-locks/testCompileClasspath.lockfile
#	implementations/micrometer-registry-wavefront/gradle/dependency-locks/testRuntime.lockfile
#	implementations/micrometer-registry-wavefront/gradle/dependency-locks/testRuntimeClasspath.lockfile
#	micrometer-core/gradle/dependency-locks/compile.lockfile
#	micrometer-core/gradle/dependency-locks/compileClasspath.lockfile
#	micrometer-core/gradle/dependency-locks/default.lockfile
#	micrometer-core/gradle/dependency-locks/runtime.lockfile
#	micrometer-core/gradle/dependency-locks/runtimeClasspath.lockfile
#	micrometer-core/gradle/dependency-locks/testCompile.lockfile
#	micrometer-core/gradle/dependency-locks/testCompileClasspath.lockfile
#	micrometer-core/gradle/dependency-locks/testRuntime.lockfile
#	micrometer-core/gradle/dependency-locks/testRuntimeClasspath.lockfile
#	micrometer-jersey2/gradle/dependency-locks/compile.lockfile
#	micrometer-jersey2/gradle/dependency-locks/compileClasspath.lockfile
#	micrometer-jersey2/gradle/dependency-locks/default.lockfile
#	micrometer-jersey2/gradle/dependency-locks/runtime.lockfile
#	micrometer-jersey2/gradle/dependency-locks/runtimeClasspath.lockfile
#	micrometer-jersey2/gradle/dependency-locks/testCompile.lockfile
#	micrometer-jersey2/gradle/dependency-locks/testCompileClasspath.lockfile
#	micrometer-jersey2/gradle/dependency-locks/testRuntime.lockfile
#	micrometer-jersey2/gradle/dependency-locks/testRuntimeClasspath.lockfile
#	micrometer-spring-legacy/gradle/dependency-locks/compile.lockfile
#	micrometer-spring-legacy/gradle/dependency-locks/compileClasspath.lockfile
#	micrometer-spring-legacy/gradle/dependency-locks/default.lockfile
#	micrometer-spring-legacy/gradle/dependency-locks/runtime.lockfile
#	micrometer-spring-legacy/gradle/dependency-locks/runtimeClasspath.lockfile
#	micrometer-spring-legacy/gradle/dependency-locks/testCompile.lockfile
#	micrometer-spring-legacy/gradle/dependency-locks/testCompileClasspath.lockfile
#	micrometer-spring-legacy/gradle/dependency-locks/testRuntime.lockfile
#	micrometer-spring-legacy/gradle/dependency-locks/testRuntimeClasspath.lockfile
#	micrometer-test/gradle/dependency-locks/compile.lockfile
#	micrometer-test/gradle/dependency-locks/compileClasspath.lockfile
#	micrometer-test/gradle/dependency-locks/default.lockfile
#	micrometer-test/gradle/dependency-locks/runtime.lockfile
#	micrometer-test/gradle/dependency-locks/runtimeClasspath.lockfile
#	micrometer-test/gradle/dependency-locks/testCompile.lockfile
#	micrometer-test/gradle/dependency-locks/testCompileClasspath.lockfile
#	micrometer-test/gradle/dependency-locks/testRuntime.lockfile
#	micrometer-test/gradle/dependency-locks/testRuntimeClasspath.lockfile
#	samples/micrometer-samples-boot1/gradle/dependency-locks/compileClasspath.lockfile
#	samples/micrometer-samples-core/gradle/dependency-locks/compileClasspath.lockfile