Backport 4.3 LDAP Features

Back port the ldap features introduced into the 4.3 release.