Merge branch 'issue615' of https://github.com/ahmetmircik/hazelcast into ahmetmircik-issue615

Conflicts:
	hazelcast/src/main/java/com/hazelcast/map/tx/TransactionalMapProxy.java