Refactor map eviction manager code. (Hold references of key-value pairs not Record objects)
Merge pull request #2326 from ahmetmircik/ms/fix2324

Fixes #2324