Merge branch '2.4.x' into 2.5.x

Closes gh-27332

spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/neo4j/Neo4jReactiveHealthIndicatorTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2021 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.
@@ -47,7 +47,7 @@ import static org.mockito.Mockito.verify;
  * @author Michael J. Simons
  * @author Stephane Nicoll
  */
-class Neo4jReactiveHealthIndicatorTest {
+class Neo4jReactiveHealthIndicatorTests {
 
 	@Test
 	void neo4jIsUp() {

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoPropertiesClientSettingsBuilderCustomizerTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2021 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.
@@ -34,7 +34,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
  *
  * @author Scott Frederick
  */
-class MongoPropertiesClientSettingsBuilderCustomizerTest {
+class MongoPropertiesClientSettingsBuilderCustomizerTests {
 
 	private final MongoProperties properties = new MongoProperties();