Merge branch '2.3' into 2.7

* 2.3:
  fixed typo

Author: fabpot

src/AppBundle/Controller/DefaultController.php

@@ -15,7 +15,7 @@ public function indexAction(Request $request)
     {
         // replace this example code with whatever you need
         return $this->render('default/index.html.twig', array(
-            'base_dir' => realpath($this->getParameter('kernel.root_dir').'/..'),
+            'base_dir' => realpath($this->container->getParameter('kernel.root_dir').'/..'),
         ));
     }
 }