Merge branch '6.4' into 7.1

* 6.4:
  Fix typo filename

Author: javiereguiluz

service_container.rst

@@ -1429,7 +1429,7 @@ Let's say you have the following functional interface::
 You also have a service that defines many methods and one of them is the same
 ``format()`` method of the previous interface::
 
-    // src/Service/MessageFormatterInterface.php
+    // src/Service/MessageUtils.php
     namespace App\Service;
 
     class MessageUtils