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

Fixes #2324 (maintenance)