Merge branch '4.1.x' into 4.2.x

Author: ryanjbaxter

docs/modules/ROOT/pages/spring-cloud-commons/common-abstractions.adoc

@@ -708,16 +708,6 @@ spring:
 
 See https://docs.oracle.com/javase/8/docs/api/java/net/Inet4Address.html#isSiteLocalAddress--[Inet4Address.html.isSiteLocalAddress()] for more details about what constitutes a site-local address.
 
-[[http-clients]]
-== HTTP Client Factories
-
-Spring Cloud Commons provides beans for creating both Apache HTTP clients (`ApacheHttpClientFactory`) and OK HTTP clients (`OkHttpClientFactory`).
-The `OkHttpClientFactory` bean is created only if the OK HTTP jar is on the classpath.
-In addition, Spring Cloud Commons provides beans for creating the connection managers used by both clients: `ApacheHttpClientConnectionManagerFactory` for the Apache HTTP client and `OkHttpClientConnectionPoolFactory` for the OK HTTP client.
-If you would like to customize how the HTTP clients are created in downstream projects, you can provide your own implementation of these beans.
-In addition, if you provide a bean of type `HttpClientBuilder` or `OkHttpClient.Builder`, the default factories use these builders as the basis for the builders returned to downstream projects.
-You can also disable the creation of these beans by setting `spring.cloud.httpclientfactories.apache.enabled` or `spring.cloud.httpclientfactories.ok.enabled` to `false`.
-
 [[enabled-features]]
 == Enabled Features