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

making sure "ResutMap" names are not getting mixed up