CRM-16980 - Improve case role handing