pulled
Merge branch 'master' of https://github.com/hazelcast/hazelcast-stabilizer into OriginMaster
Merge branch 'master' of https://github.com/hazelcast/hazelcast-stabilizer into OriginMaster
Merge branch 'master' of https://github.com/hazelcast/hazelcast-stabilizer

Conflicts:
	dist/src/main/dist/conf/stabilizer.properties
Merge pull request #152 from Danny-Hazelcast/testFix

Test fix