Bug 1069186: handling missing group instance
Merge pull request #4816 from abhgupta/stage_fix_1069186

Merged by openshift-bot