Two changes regarding role mapping.

1 - The users principal should not be treated as a role.
2 - Simplify the '*' role handling as the principal/roles map is not applicable.