[Merge] lp:~phablet-team/history-service/improve_roles_management into lp:history-service/staging

[Gustavo Pichorim Boiko]

Review: Approve

Looks good!
-- 
https://code.launchpad.net/~phablet-team/history-service/improve_roles_management/+merge/316377
Your team Ubuntu Phablet Team is subscribed to branch lp:~phablet-team/history-service/wait_for_self_not_pending.