map store test fixes
LRU/LFU evictions work when statistics enabled.
Merge remote-tracking branch 'origin/master'