refactor ldap roles
Merge branch 'LDAPRefactor' into develop