Unify usage of httpcomponents 4.x