[Merge] lp:~ubuntu-mate-dev/ubuntu-cdimage/ubuntu-mate into lp:ubuntu-cdimage

[Colin Watson]

Review: Resubmit

As you can see from the gigantic diff, the merge target is wrong.  Please resubmit against https://code.launchpad.net/~ubuntu-cdimage/debian-cd/ubuntu.
-- 
https://code.launchpad.net/~ubuntu-mate-dev/ubuntu-cdimage/ubuntu-mate/+merge/246176
Your team Ubuntu Sponsors Team is requested to review the proposed merge of lp:~ubuntu-mate-dev/ubuntu-cdimage/ubuntu-mate into lp:ubuntu-cdimage.