Merge branch '4.2.x'

Author: ryanjbaxter

docs/modules/ROOT/partials/_configprops.adoc

@@ -44,7 +44,6 @@
 |spring.cloud.loadbalancer.enabled | `+++true+++` | Enables Spring Cloud LoadBalancer.
 |spring.cloud.loadbalancer.health-check.initial-delay | `+++0+++` | Initial delay value for the HealthCheck scheduler.
 |spring.cloud.loadbalancer.health-check.interval | `+++25s+++` | Interval for rerunning the HealthCheck scheduler.
-|spring.cloud.loadbalancer.health-check.interval  | `+++25s+++` | Interval for rerunning the HealthCheck scheduler.
 |spring.cloud.loadbalancer.health-check.path |  | Path at which the health-check request should be made. Can be set up per `serviceId`. A `default` value can be set up as well. If none is set up, `/actuator/health` will be used.
 |spring.cloud.loadbalancer.health-check.port |  | Path at which the health-check request should be made. If none is set, the port under which the requested service is available at the service instance.
 |spring.cloud.loadbalancer.health-check.refetch-instances | `+++false+++` | Indicates whether the instances should be refetched by the `HealthCheckServiceInstanceListSupplier`. This can be used if the instances can be updated and the underlying delegate does not provide an ongoing flux.

spring-cloud-commons/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -59,12 +59,6 @@
 			"description": "Initial delay value for the HealthCheck scheduler.",
 			"type": "java.time.Duration"
 		},
-		{
-			"name": "spring.cloud.loadbalancer.health-check.interval ",
-			"defaultValue": "25s",
-			"description": "Interval for rerunning the HealthCheck scheduler.",
-			"type": "java.time.Duration"
-		},
 		{
 			"name": "spring.cloud.loadbalancer.health-check.path",
 			"description": "Path at which the health-check request should be made. Can be set up per `serviceId`. A `default` value can be set up as well. If none is set up, `/actuator/health` will be used.",