merging

Conflicts:
	hazelcast/src/main/java/com/hazelcast/map/DefaultRecordStore.java