[Merge] lp:~waveform/meta-release/ubuntu into lp:~ubuntu-core-dev/meta-release/ubuntu

[Brian Murray]

I merged this then dropped UC18 and modified the website url for UC20 to something Ubuntu Core specific.
-- 
https://code.launchpad.net/~waveform/meta-release/ubuntu/+merge/406607
Your team Ubuntu Core Development Team is requested to review the proposed merge of lp:~waveform/meta-release/ubuntu into lp:~ubuntu-core-dev/meta-release/ubuntu.