start back porting PR #2420 to maintenance
back porting PR #2420 to maintenance cont.
back porting PR #2420 to maintenance cont. 2
back porting PR #2420 to maintenance cont. 3
organize imports
Merge pull request #2449 from ahmetmircik/mt_rewrite

(maintenance) Rewriting of eviction & expiration & write behind mapstore