Merge pull request #4586 from danmcp/master

Merged by openshift-bot
Rebalancing tests