client proxy init synced
Merge branch 'master' of github.com:hazelcast/hazelcast into client-proxy-init/3.3

Conflicts:
	hazelcast-client/src/main/java/com/hazelcast/client/spi/ProxyManager.java
Merge branch 'master' of github.com:hazelcast/hazelcast into client-proxy-init/3.3

Conflicts:
	hazelcast-client/src/main/java/com/hazelcast/client/spi/ProxyManager.java
changed the inner class to static
fixed setting context
Merge pull request #2375 from gurbuzali/client-proxy-init/3.3

client proxy init synced