TRUNK-4114: Handle exception thrown by deletion of referenced role and m...

...erge conflicts