Fix getPort() returning 80 instead of 443 when X-FORWARDED-PROTO is set to https
Merge branch '2.1' into 2.2

* 2.1:
  Fix getPort() returning 80 instead of 443 when X-FORWARDED-PROTO is set to https
Merge branch '2.2'

* 2.2:
  Fix getPort() returning 80 instead of 443 when X-FORWARDED-PROTO is set to https
  [Translation] fixed a unit test

Conflicts:
	src/Symfony/Component/HttpFoundation/Request.php