Fix for https://github.com/hazelcast/hazelcast/issues/1719 and
https://github.com/hazelcast/hazelcast/issues/1764
Merge branch 'master' of github.com:torkeld/hazelcast