Upgrade to httpclient and core 4.3