Fixes to satisfy sonar after merge of httpclient change