Remove use of file-system-roots plugin (functionality now built into file plugin)
Merge branch 'upstream' (remove file-system-roots plugin)