fix typo
fix var default
Merge branch 'ldap' into rabe
Merge branch 'eap-config' into rabe