x# This is a combination of 2 commits.

Add schemas for ldap clients, correct ldap attribute names