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

[Sergio Costas]

Review: Needs Fixing

Also, after enabling Ubuntu Pro, the "Enable FIPS" button remains disabled, and the "Enable USG" still does nothing.
-- 
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.