ActionDispatch::Http::URL.normalize_port should not strip port for protocol relative URL.
Always use the provided port for protocol relative urls

There may be situations where you need to tunnel SSL connections over
port 80 so we shouldn't remove it if it has been explicitly provided.
Merge branch 'master' of github.com:rails/rails