#147 dont hold locktree manager mutex when escalating
Merge branch 'master' into scoped_malloc