[ADD] Locking revised; now based on visitor
[MIN] lock2 -> lock
Merge branch 'visitor-locking'
[MOD] XQuery, Visitor Locking: merge, various fixes