Fix compilation followig removal of commons-httpclient dependency. See BZ1155314: CVE-2012-6153 CVE-2014-3577

(cherry picked from commit d306dd9986c33a40ce0118a1bd96bd0dee55aece)