Merge branch 'allow-alternative-http-clients' into fork-pom