Work in Progress
Merge branch 'oome' of github.com:hazelcast/hazelcast into oome