Lots of fixs.
Merge branch 'master' of github.com:hazelcast/hazelcast