First minor adoptions - add btrfs, which needs btrfs-progs in iso
Merge conflicts