[Merge] ~waveform/livecd-rootfs:fix-swapfile into livecd-rootfs:ubuntu/master

[Dave Jones]

> Oh, and one more thing: could you add a changelog entry as well?

Will push one in a mo
-- 
https://code.launchpad.net/~waveform/livecd-rootfs/+git/livecd-rootfs/+merge/415625
Your team Ubuntu Core Development Team is requested to review the proposed merge of ~waveform/livecd-rootfs:fix-swapfile into livecd-rootfs:ubuntu/master.