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

[Robert Ancell]

- I've fixed the indentation
- The ubuntu.com/pro URL not being active is known, this will be active at the time of release.
- The USG feature button should have been insensitive - this code had been disabled during testing and was accidentally commited. Fixed now.
- It is correct that most services are not available, to fully test them you would have to run an older LTS which supports this. Not all services are set to be enabled anywhere yet.
- What release did you test the case where re-enabling ESM apps failed?
-- 
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.