lock mapblock cache, add mapnode logger
Merge remote-tracking branch 'upstream/master' into lockvm