LDAP client configuration-cleanup/bugfix

Refs RM ticket 3219.