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

[Sergio Costas]

Review: Needs Information

Changing into a "UA Apps - Essential (Physical)" token, now "ESM Apps" is enabled; but if I disable it, trying to enable it again fails showing a "Could not enable ESM Apps. Please try again" error message.
-- 
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.