Disallow editing roles not associated with a plan

Change-Id: I4fb6b2476e9aef163cc3f21e6387d47259336d25
Closes-bug: #1373837
Merge "Disallow editing roles not associated with a plan"