Small improvements.
Merge branch '3.merge' into 3.0
Merge branch '3.0' of github.com:hazelcast/hazelcast into 3.0
Compilation fix.