[RCD] A few patches for LDAP and identities