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

[Robert Ancell]

The above changes are now merged in. I'm ready to upload if Chad is happy with the current state.
-- 
https://code.launchpad.net/~robert-ancell/software-properties/+git/software-properties/+merge/400153
Your team Ubuntu Core Development Team is requested to review the proposed merge of ~robert-ancell/software-properties:esm into software-properties:ubuntu/master.