Merge branch '3.4' into 4.2

* 3.4:
  minor #11543 Fix php config example for hinclude_default_template (andrew-demb)

Author: OskarStark

templating/hinclude.rst

@@ -93,9 +93,7 @@ in your application configuration:
         $container->loadFromExtension('framework', [
             // ...
             'templating' => [
-                'hinclude_default_template' => [
-                    'hinclude.html.twig',
-                ],
+                'hinclude_default_template' => 'hinclude.html.twig',
             ],
         ]);