Merge "Use protocol default port with HTTP_X_FORWARDED_PROTO"