New version of httpclient
Merge
merged for use with updated httpclient api