Merge "Abort FUSE as part of volume reset" into tm-dev