Merge "Bug-4957 Fix SalRoleService blocking call"