Merge branch 'master' of https://github.com/hazelcast/hazelcast
Merge branch 'master' of https://github.com/hazelcast/hazelcast
Merge branch 'master' of https://github.com/hazelcast/hazelcast
map delayed store & eviction fre-write first commit
Merge branch 'master' of https://github.com/hazelcast/hazelcast

Conflicts:
	hazelcast/src/main/java/com/hazelcast/map/MapEvictionManager.java
map store test fixes
map delayed store & eviction re-write cleanup
add TODO
some additional clean up
Merge branch 'master' of https://github.com/hazelcast/hazelcast
more cleanup
some fixes
some fixes cont
some fixes cont 2
some fixes cont 3
skip 2 replicated map tests
remove problematic tests
fix equals
fix equals
fix client