Now also clearing the uri builder's port if the X-Forwarded-Host header is set. Use any ports from the header and if no ports present in the header, clear out the port set from the current request.