[Merge] ~waveform/livecd-rootfs:bonfire-of-hacks into livecd-rootfs:ubuntu/master

[Dave Jones]

Please see associated bug; it should link to both relevant merge requests
-- 
https://code.launchpad.net/~waveform/livecd-rootfs/+git/livecd-rootfs/+merge/436648
Your team Ubuntu Core Development Team is requested to review the proposed merge of ~waveform/livecd-rootfs:bonfire-of-hacks into livecd-rootfs:ubuntu/master.