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

[Sebastien Bacher]

Review: Approve

It seems to work as intended and get several round of testings and review, let's merge!
-- 
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.