[Merge] lp:~rbalint/livecd-rootfs/use-ubuntu-image into lp:livecd-rootfs

[Balint Reczey]

I like the diversion part less and less, I'll give the patch a try without it tomorrow.
-- 
https://code.launchpad.net/~rbalint/livecd-rootfs/use-ubuntu-image/+merge/322323
Your team Ubuntu Core Development Team is requested to review the proposed merge of lp:~rbalint/livecd-rootfs/use-ubuntu-image into lp:livecd-rootfs.