make a few change to more cleanly handle the ldap integration in KFS