FT-600 locktree refs crash test and bug fix
Merge branch 'ft600' into releases/tokumx-2.0