map eviction code cleanup & refactorings
Merge pull request #2169 from ahmetmircik/evictionRefactorings

Map eviction code cleanup & refactorings