adds equals and hashcode methods to the ClientProxy class which resembles its server-side counter part
Merge branch 'master' into add_clientproxy_equals_hashcode
 #1691 modifies equals and hashcode to consider the client name, which is unique for each HazelcastClient instance
Merge branch 'master' into add_clientproxy_equals_hashcode

Conflicts:
	hazelcast-client/src/main/java/com/hazelcast/client/proxy/ClientExecutorServiceProxy.java
	hazelcast-client/src/main/java/com/hazelcast/client/proxy/ClientReplicatedMapProxy.java
	hazelcast-client/src/main/java/com/hazelcast/client/spi/ProxyManager.java
sync with upstream
removes commented code
Merge pull request #1706 from ghepardo/add_clientproxy_equals_hashcode

adds equals and hashcode methods to the ClientProxy class