Merge "Fix for implied roles test"