Backport https://github.com/hazelcast/hazelcast/pull/3926/
Backport https://github.com/hazelcast/hazelcast/pull/3926/

tombujok/hazelcast,tufangorel/hazelcast,juanavelez/hazelcast,Donnerbart/hazelcast,mdogan/hazelcast,lmjacksoniii/hazelcast,juanavelez/hazelcast,dbrimley/hazelcast,mesutcelik/hazelcast,lmjacksoniii/hazelcast,mdogan/hazelcast,emrahkocaman/hazelcast,emre-aydin/hazelcast,mdogan/hazelcast,tkountis/hazelcast,tkountis/hazelcast,dbrimley/hazelcast,tombujok/hazelcast,mesutcelik/hazelcast,tufangorel/hazelcast,dbrimley/hazelcast,Donnerbart/hazelcast,tkountis/hazelcast,dsukhoroslov/hazelcast,mesutcelik/hazelcast,emre-aydin/hazelcast,dsukhoroslov/hazelcast,emre-aydin/hazelcast,emrahkocaman/hazelcast,tufangorel/hazelcast,Donnerbart/hazelcast