Merge branch 'rename-apache-http-client-5' into all-together · open-telemetry/opentelemetry-java-instrumentation@329ce37