Merge "Normalize url without port with schema default port"