Fix order of roles when editing a role.
Merge pull request #4738 from openscholar/4737

Fix order of roles when editing a role.