Merge pull request #4553 from danmcp/master

Merged by openshift-bot
Rebalancing cartridge tests