Merge pull request #996 from jmaas/release24

Merge fixes
Minor improvement to LDAP configuration, fixes #217