Editing roles when scheduled update causes all roles disablings

Change-Id: Ic8e842c474838163b8c4556e2f935922953ba5f6
Closes-bug: 1317119
Merge "Editing roles when scheduled update causes all roles disablings"