ISPN-4631 Make sure test servers are shut down after tests
ISPN-5023 Random Failues on *FactoryBeanTest in the Spring Modules
Revert "Revert rebalancing per cache"

This reverts commit 8cbba22ae625c7dd3e8f5ff389b71f4b49aec2b4.