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

[Sergio Costas]

Review: Needs Fixing

The new files have indentation inconsistencies: it uses two spaces in nearly all the lines, except in some where four are used. All the other files use four spaces.
-- 
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.