PLAG-183 Fix HttpClient to use system properties