Switch some classes to HttpComponents
Some more httpclient fixes
Last httpcomponents conversion