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

Conflicts:
	dist/src/main/dist/conf/stabilizer.properties