- revert lock cancellation to blocking thread for glimpse ASTs (3409)
- fix rare problem with rename on htree directories (3417)
- 2.6 patch fixes