ActionDispatch::Http::URL.normalize_port should not strip port for protocol relative URL.

(cherry picked from commit be93d94ef28421a2dbcd6ed870b454433a5a0a72)
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.

(cherry picked from commit 2378f69e69f98460f426d2c4e0fbb967b4fa5ddf)

Conflicts:
	actionpack/CHANGELOG.md