Various fixes to make LDAP happy with the new location
Merge branch 'ds'