map query
Merge remote-tracking branch 'origin/3.0' into 3.0

Conflicts:
	hazelcast/src/main/java/com/hazelcast/collection/CollectionService.java