Merge branch '2.5.x' into 2.6.x

Closes gh-30651

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/wavefront/WavefrontProperties.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -51,9 +51,9 @@ public class WavefrontProperties extends PushRegistryProperties {
 	private String apiToken;
 
 	/**
-	 * Global prefix to separate metrics originating from this app's white box
-	 * instrumentation from those originating from other Wavefront integrations when
-	 * viewed in the Wavefront UI.
+	 * Global prefix to separate metrics originating from this app's instrumentation from
+	 * those originating from other Wavefront integrations when viewed in the Wavefront
+	 * UI.
 	 */
 	private String globalPrefix;