Merge branch '2.6' into 2.7

* 2.6:
  Backporting some stuff from 2.7, that I think must have gotten merged only there by accident

Author: weaverryan

book/security.rst

@@ -817,7 +817,7 @@ You can easily deny access from inside a controller::
         $this->denyAccessUnlessGranted('ROLE_ADMIN', null, 'Unable to access this page!');
 
         // Old way :
-        // if (false === $this->get('security.context')->isGranted('ROLE_ADMIN')) {
+        // if (false === $this->get('security.authorization_checker')->isGranted('ROLE_ADMIN')) {
         //     throw $this->createAccessDeniedException('Unable to access this page!');
         // }