[sailfish-snapshot] Fix make_system_bootable() to work with btrfs-progs-3.16
Merge pull request #2 from tigeli/master

[sailfish-snapshot] Fix make_system_bootable() to work with btrfs-progs-3.16