[Merge] ~nteodosio/software-properties:update-state-after-token-none into software-properties:ubuntu/master

[Sebastien Bacher]

Review: Needs Fixing

in fact it needs to be adapted since the code seems to have changed, could you rebase and adapt?
-- 
https://code.launchpad.net/~nteodosio/software-properties/+git/software-properties/+merge/437143
Your team Ubuntu Core Development Team is subscribed to branch software-properties:ubuntu/master.