Merge changes I98554ebf,I30be85b2

* changes:
  Revert "Resolve FUSE and lower FS cache inconsistencies"
  Revert "Fix memory leaks on filesystem unmount"