[Merge] ~mwhudson/livecd-rootfs/+git/livecd-rootfs:canary-fixes-N into livecd-rootfs:ubuntu/master

[Michael Hudson-Doyle]

i.e. i'm going to self approve this.
-- 
https://code.launchpad.net/~mwhudson/livecd-rootfs/+git/livecd-rootfs/+merge/449986
Your team Ubuntu Core Development Team is requested to review the proposed merge of ~mwhudson/livecd-rootfs/+git/livecd-rootfs:canary-fixes-N into livecd-rootfs:ubuntu/master.