Merge branch '2021-01-20-fs-fixes'

- Minor SquashFS, BTRFS ubifs fixes