Updated pull request accouding to feedback on https://github.com/hazelcast/hazelcast/pull/1493.