[Merge] ~mwhudson/livecd-rootfs/+git/livecd-rootfs:lp-2100148 into livecd-rootfs:ubuntu/master

[Michael Hudson-Doyle]

As discussed, while the initial part of this was a real problem, there was another issue lurking as well. Please take another look.
-- 
https://code.launchpad.net/~mwhudson/livecd-rootfs/+git/livecd-rootfs/+merge/481992
Your team Ubuntu Core Development Team is subscribed to branch livecd-rootfs:ubuntu/master.