Made changes to use the HttpClient in the client

#1908
temp-commit
temp-commit