TRUNK-4114: Handle exception thrown by deletion of referenced role and merge conflicts
TRUNK-4114: Handle exception thrown by deletion of referenced role