changes as per RP comments

Merge branch 'master' into coverage

Conflicts:
	hazelcast-client/src/test/java/com/hazelcast/client/ClientNearCacheTest.java