LDAP Changes

Code review: None