NMS-7122 fix HttpClient usage in a number of codepaths