Merge branch '3.0' of /Users/enesakar/dev/hazelcast/hazelcast3 with conflicts.