Bug 1067404: Handling additional storage correctly at the group level
Bug 1109646: dup was being called on nil
Merge pull request #5458 from abhgupta/abhgupta-dev

Merged by openshift-bot