Initial move to apache httpclient 4