Merge pull request #123 from nmaas-platform/52-fix-users-view-when-user-has-both-system-admin-and-domain-admin-role

52 fix users view when user has both system admin and domain admin role