[Merge] ~jefferyto/ubuntu/+source/initramfs-tools:ubuntu-core-dev-hibernate-fixes into ~ubuntu-core-dev/ubuntu/+source/initramfs-tools:ubuntu/devel

[Benjamin Drung]

I tried to test it in a VM and both the swap file and the swap partition report `swap` as type. I propose following simpler approach as solution: https://git.launchpad.net/~bdrung/ubuntu/+source/initramfs-tools/commit/?id=a9bd6db70c0fd19a19480604a259432af00b8158

Can you test if that would be enough?
-- 
https://code.launchpad.net/~jefferyto/ubuntu/+source/initramfs-tools/+git/initramfs-tools/+merge/467060
Your team Ubuntu Core Development Team is subscribed to branch ~ubuntu-core-dev/ubuntu/+source/initramfs-tools:ubuntu/devel.