Merge "Bug 577829 - Httpclient 5.0.2 has severe CVE"