Fixes #5509: do not delete parent of what you delete
Merge pull request #626 from fanf/bug_5509/group_deletion_brings_havoc_in_git_config_repos_state

Fixes #5509: do not delete parent of what you delete
Merge branch 'branches/rudder/2.6' into branches/rudder/2.10
Merge branch 'branches/rudder/2.10' into branches/rudder/2.11
Merge branch 'branches/rudder/2.11'