Merge branch '3.0' of github.com:hazelcast/hazelcast into 3.0

Conflicts:
	hazelcast/src/main/java/com/hazelcast/map/LockInfo.java