First part improvements of PR #2420

First part improvements of PR #2420:
Mainly includes:
 - expiration cleanup improvements
 - map store & expiration/eviction relations
 - adding an upper bound to WBQs
I did not understand. What do you expect? Entry is evicted but if there is map store it is loaded then.