Merge branch '6.4' into 7.1

* 6.4:
  use /templates instead of /Resources/views

Author: javiereguiluz

templates.rst

@@ -1273,7 +1273,7 @@ and leaves the repeated contents and HTML structure to some parent templates.
 
     .. code-block:: html+twig
 
-        {# app/Resources/views/blog/index.html.twig #}
+        {# templates/blog/index.html.twig #}
         {% extends 'base.html.twig' %}
 
         {# the line below is not captured by a "block" tag #}
@@ -1460,7 +1460,7 @@ templates under an automatic namespace created after the bundle name.
 
 For example, the templates of a bundle called ``AcmeBlogBundle`` are available
 under the ``AcmeBlog`` namespace. If this bundle includes the template
-``<your-project>/vendor/acme/blog-bundle/Resources/views/user/profile.html.twig``,
+``<your-project>/vendor/acme/blog-bundle/templates/user/profile.html.twig``,
 you can refer to it as ``@AcmeBlog/user/profile.html.twig``.
 
 .. tip::