WL-3191 Add all the roles uniquely

Now that we are adding roles from multiple realms, let's make sure they
only appear once each.