Fixed a bug with the cascading removal of roles when removing entities
Merge remote-tracking branch 'origin/SimplifiedRoles' into SimplifiedRoles