[HttpFoundation] tweaked previous merge
[HttpFoundation] tweaked previous merge


oswaldderiemaecker/HttpFoundation,symfony/HttpFoundation,nichdu/HttpFoundation,ygerasimov/HttpFoundation,mneuhaus/HttpFoundation,symfony/http-foundation