[Merge] ~mwhudson/livecd-rootfs/+git/livecd-rootfs:live-cloud-init into livecd-rootfs:ubuntu/master

[Michael Hudson-Doyle]

I've tested now, this works. We should move to using a cloud.cfg.d snippet vs overriding everything but one thing at a time.
-- 
https://code.launchpad.net/~mwhudson/livecd-rootfs/+git/livecd-rootfs/+merge/380175
Your team Ubuntu Core Development Team is requested to review the proposed merge of ~mwhudson/livecd-rootfs/+git/livecd-rootfs:live-cloud-init into livecd-rootfs:ubuntu/master.