Merge pull request #1 from tigeli/master

[sailfish-snapshot] Fix version number for snapshots JB#19255
[sailfish-snapshot] Fix make_system_bootable() to work with btrfs-progs-3.16