Merge in new multiple LDAP base search functionality