Merge branch 'KON-599_disable_ldap' into DEVELOP
2 files changed