Merge branch 'feature/rcanow' into develop
Set LDAP as the primary authentication backened on staging
Merge branch 'develop' into staging