[HttpKernel] fixed locale management when exiting sub-requests

This fix is temporary as #7007 will fix it properly in Symfony 2.3.
Merge branch '2.1' into 2.2

* 2.1:
  [HttpKernel] fixed locale management when exiting sub-requests