quick fix
Merge remote-tracking branch 'origin/3.0' into 3.0

Conflicts:
	hazelcast-client/src/main/java/com/hazelcast/client/spi/impl/ClientClusterServiceImpl.java