[Merge] ~seb128/livecd-rootfs:canary-new-desktop into livecd-rootfs:ubuntu/master

[Łukasz Zemczak]

Review: Approve

Ok, this looks good. It's actually less changes than I expected! Was worried there might be some conditional branches there that would be hard to catch as they'd be only implicitly dependent on non-canary, but... I think this is actually it. I'll give it a spin and then merge it in with the cdimage changes.

Thanks!
-- 
https://code.launchpad.net/~seb128/livecd-rootfs/+git/livecd-rootfs/+merge/433534
Your team Ubuntu Core Development Team is subscribed to branch livecd-rootfs:ubuntu/master.