Merge branch '7.0' into 7.1

* 7.0:
  [#18757] fix merge

Author: xabbuh

routing.rst

@@ -2610,7 +2610,6 @@ defined as attributes:
         controllers:
             resource: '../../src/Controller/'
             type: attribute
-            defaults:
             schemes: [https]
 
     .. code-block:: xml