Merge pull request #4973 from danmcp/master

Merged by openshift-bot
Revert "Rebalancing tests"

This reverts commit 444c6a496f6826de78a4338e580d153d1620e406.