Merge "Updates WebAddress to ignore the colon after the host component of a URL if no port is specified"