Merge branch '1.6.x' into 1.7.x

# Conflicts:
#	implementations/micrometer-registry-graphite/gradle.lockfile
#	implementations/micrometer-registry-statsd/gradle.lockfile
#	micrometer-core/gradle.lockfile
#	micrometer-test/gradle.lockfile
#	samples/micrometer-samples-boot2/gradle.lockfile
#	samples/micrometer-samples-core/gradle.lockfile

Author: jonatan-ivanov

implementations/micrometer-registry-graphite/gradle.lockfile

@@ -172,8 +172,8 @@ public Duration step() {
         WavefrontClient sender = builder.build();
         assertThat(builder).hasFieldOrPropertyWithValue("flushInterval", 15_000L);
         assertThat(builder).hasFieldOrPropertyWithValue("flushIntervalTimeUnit", TimeUnit.MILLISECONDS);
-        assertThat(sender).extracting("reportingService").hasFieldOrPropertyWithValue("uri", URI.create("https://example.com"));
-        assertThat(sender).extracting("reportingService").hasFieldOrPropertyWithValue("token", "apiToken");
+        assertThat(sender).extracting("metricsReportingService").hasFieldOrPropertyWithValue("uri", URI.create("https://example.com"));
+        assertThat(sender).extracting("metricsReportingService").hasFieldOrPropertyWithValue("token", "apiToken");
         assertThat(sender).hasFieldOrPropertyWithValue("batchSize", 20);
     }