Merge branch '2.1.x'

Closes gh-17224

Author: wilkinsona

spring-boot-project/spring-boot-dependencies/pom.xml

@@ -145,7 +145,7 @@
 		<logback.version>1.2.3</logback.version>
 		<lombok.version>1.18.8</lombok.version>
 		<mariadb.version>2.4.1</mariadb.version>
-		<micrometer.version>1.1.4</micrometer.version>
+		<micrometer.version>1.1.5</micrometer.version>
 		<mimepull.version>1.9.11</mimepull.version>
 		<mockito.version>2.28.2</mockito.version>
 		<mongo-driver-reactivestreams.version>1.11.0</mongo-driver-reactivestreams.version>