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

[Sebastien Bacher]

Sebastien Bacher has proposed merging livecd-rootfs:canary-new-desktop into livecd-rootfs:ubuntu/master.

Requested reviews:
  Łukasz Zemczak (sil2100)

For more details, see:
https://code.launchpad.net/~ubuntu-core-dev/livecd-rootfs/+git/livecd-rootfs/+merge/433533

Not tested but that's basically inverting the cases, making the default codepath do what was under 'canary' before and define intead a 'legacy' for what was the old default.
-- 
Your team Ubuntu Core Development Team is subscribed to branch livecd-rootfs:ubuntu/master.