storage: add -f to mkfs.btrfs _defaultFormatOptions, newer btrfs-progs needs it
storage: add sync to the EFI System Partition mount options

This should mitigate the potential corruption problems that may
render a system unbootable
Merge remote-tracking branch 'upstream/master'