ISPN-4631 Make sure test servers are shut down after tests
ISPN-5023 Random Failues on *FactoryBeanTest in the Spring Modules
singletonstoretest separate branch