The big conversion to httpclient 4