fixes #2219 - Hostgroup ownership is hierarchical
fixes #2278 orchestration test failure