Bug 989941: preventing colocation of cartridges that independently scale
Merge pull request #5087 from abhgupta/abhgupta-dev

Merged by openshift-bot