[Merge] ~robert-ancell/software-properties:ubuntu-pro-merge into software-properties:ubuntu/master

[Sebastien Bacher]

Robert, do you think we could change ubuntu.com/pro to be clickable and upload? or was there more questions to resolve for you. it's getting late, with the SRU verification delay and the launch date we should have got the updates in proposed yesterday...
-- 
https://code.launchpad.net/~robert-ancell/software-properties/+git/software-properties/+merge/430260
Your team Ubuntu Core Development Team is requested to review the proposed merge of ~robert-ancell/software-properties:ubuntu-pro-merge into software-properties:ubuntu/master.