update httpclient to 4.2.5
Merge pull request #702 from jay-hodgson/release-22

update httpclient to 4.2.5 in an attempt to fix NoClassDefFoundError org/apache/http/client/utils/URIBuilder on staging
Merge pull request #706 from jay-hodgson/develop

merge down from release-22