Merge branch '2.4' into 2.5

Conflicts:
	book/translation.rst

Author: weaverryan

contributing/documentation/standards.rst

@@ -92,6 +92,8 @@ Files and Directories
 * When you list a Symfony file/directory hierarchy, use ``your-project/`` as the
   top level directory. E.g.
 
+  .. code-block:: text
+
       your-project/
       ├─ app/
       ├─ src/

cookbook/console/commands_as_services.rst

@@ -90,9 +90,9 @@ have some ``NameRepository`` service that you'll use to get your default value::
 
         public function __construct(NameRepository $nameRepository)
         {
-            parent::__construct();
-            
             $this->nameRepository = $nameRepository;
+            
+            parent::__construct();
         }
 
         protected function configure()