Merge branch 'stable-2.2' into control-path-bkp

diff --cc ansible.cfg
index 87f54df0ae8ba1e7a08ade55333c6415aee26c60,8b8868cc6f3c57827fb49183e2ecaa26eb9d457c..7b751dce9a1e40edb647c629d6a35d15b36486f5
--- 1/ansible.cfg
--- 2/ansible.cfg
+++ b/ansible.cfg
@@@ -9,5 -6,4 +9,5 @@@ roles_path = ./role
  log_path = /var/log/ansible.log
  
  [ssh_connection]
 -control_path = %(directory)s/%%h-%%r # see: https://github.com/ansible/ansible/issues/11536
 +# see: https://github.com/ansible/ansible/issues/11536
- control_path = %(directory)s/%%h-%%r
++control_path = %(directory)s/%%h-%%r