Fix missing roles from the UI when they weren't associated with users.
Merge branch 'master' into gsa