Merge branch '2.2.x' into 2.3.x

Closes gh-22774

Author: mbhave

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/HealthEndpointDocumentationTests.java

@@ -81,8 +81,7 @@ void health() throws Exception {
 				.description("The nested components that make up the health.").optional();
 		FieldDescriptor componentDetails = subsectionWithPath("components.*.details")
 				.description("Details of the health of a specific part of the application. "
-						+ "Presence is controlled by `management.endpoint.health.show-details`. May contain nested "
-						+ "components that make up the health.")
+						+ "Presence is controlled by `management.endpoint.health.show-details`.")
 				.optional();
 		this.mockMvc.perform(get("/actuator/health").accept(MediaType.APPLICATION_JSON)).andExpect(status().isOk())
 				.andDo(document("health",