Merge branch '7.0' into 7.1

* 7.0:
  Disable a validation rule in the docs linter

.doctor-rst.yaml

@@ -1,9 +1,5 @@
 rules:
     american_english: ~
-    argument_variable_must_match_type:
-        arguments:
-            - { type: 'ContainerBuilder', name: 'container' }
-            - { type: 'ContainerConfigurator', name: 'container' }
     avoid_repetetive_words: ~
     blank_line_after_anchor: ~
     blank_line_after_directive: ~