Merge branch '6.4' into 7.0

* 6.4:
  [HttpCache] Remove SensioFrameworkExtraBundle reference

Author: javiereguiluz

http_cache/_expiration-and-validation.rst.inc

@@ -5,10 +5,3 @@
     both worlds. In other words, by using both expiration and validation, you
     can instruct the cache to serve the cached content, while checking back
     at some interval (the expiration) to verify that the content is still valid.
-
-    .. tip::
-
-        You can also define HTTP caching headers for expiration and validation by using
-        annotations. See the `FrameworkExtraBundle documentation`_.
-
-.. _`FrameworkExtraBundle documentation`: https://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/annotations/cache.html