Merge pull request #997 from jmaas/release26

Merge fixes
Minor improvement to LDAP configuration, fixes #217