Ensure non-standard ports get included in generated URL

Whenever host is included in a URL, always include ports that are non-standard for the given scheme