merged keystone/openldap support (from x-ldap)