Use protocol default port with HTTP_X_FORWARDED_PROTO

When $_SERVER['HTTP_X_FORWARDED_PROTO'] is set, keep the detected
protocol default port rather than using the local server port when
creating a canonical URL.

Bug: 70021
Change-Id: I2b37da5872929e1c461ff20cccf3dfe11f182a2f
Merge "Use protocol default port with HTTP_X_FORWARDED_PROTO"