Merge branch '5.3' into 5.4

* 5.3:
  [Twig] Fix global variable name in XML config

Author: javiereguiluz

templating/global_variables.rst

@@ -92,7 +92,7 @@ the ``@`` character, which is the usual syntax to
 
             <twig:config>
                 <!-- ... -->
-                <twig:global key="foo" id="App\Generator\UuidGenerator" type="service"/>
+                <twig:global key="uuid" id="App\Generator\UuidGenerator" type="service"/>
             </twig:config>
         </container>