Merge branch '1.6.x' into 1.7.x

# Conflicts:
#	implementations/micrometer-registry-graphite/gradle/dependency-locks/testCompileClasspath.lockfile
#	implementations/micrometer-registry-graphite/gradle/dependency-locks/testRuntimeClasspath.lockfile
#	implementations/micrometer-registry-statsd/gradle/dependency-locks/testCompileClasspath.lockfile
#	implementations/micrometer-registry-statsd/gradle/dependency-locks/testRuntimeClasspath.lockfile
#	micrometer-core/gradle/dependency-locks/compileClasspath.lockfile
#	micrometer-core/gradle/dependency-locks/runtimeClasspath.lockfile
#	micrometer-core/gradle/dependency-locks/testCompileClasspath.lockfile
#	micrometer-core/gradle/dependency-locks/testRuntimeClasspath.lockfile
#	samples/micrometer-samples-core/gradle/dependency-locks/compileClasspath.lockfile

CONTRIBUTING.md

@@ -67,7 +67,7 @@ dependencies {
 
 ## Running Docker integration tests
 
-Micrometer has a number of integration tests that are implemented with [Testcontainers](https://www.testcontainers.org/) and uses Docker. These tests do not run by default.
+Micrometer has a number of integration tests that are implemented with [Testcontainers](https://www.testcontainers.org/) and use Docker. These tests do not run by default.
 
 The integration tests for Elasticsearch use the elasticsearch docker image that has the [Elastic License 2.0](https://github.com/elastic/elasticsearch/blob/master/licenses/ELASTIC-LICENSE-2.0.txt).
 Do not run the Micrometer integration tests if you do not agree to the terms of the license.