fix issue #996
fix issue #996
Merge branch 'issue996fix' of https://github.com/ahmetmircik/hazelcast into ahmetmircik-issue996fix

Conflicts:
	hazelcast-client/src/test/java/com/hazelcast/client/map/ClientMapTest.java
	hazelcast/src/main/java/com/hazelcast/map/client/MapAddEntryListenerRequest.java
Merge branch 'maintenance-3.x' of github.com:hazelcast/hazelcast into maintenance-3.x