Fix for Bug NMS-6916

After upgrading HttpClient, the host header always contains the port
which is a problem for Microsoft IIS.
[bamboo] Automated branch merge (from 1.12:58c175cc43d79a37da30392ee383069692aedc0a)