[Merge] livecd-rootfs:pi-desktop-one-gadget into livecd-rootfs:ubuntu/master

[Dave Jones]

Review: Approve

One branch to rule them all!

LGTM :)
-- 
https://code.launchpad.net/~ubuntu-core-dev/livecd-rootfs/+git/livecd-rootfs/+merge/415895
Your team Ubuntu Core Development Team is requested to review the proposed merge of livecd-rootfs:pi-desktop-one-gadget into livecd-rootfs:ubuntu/master.