Merge Peter's debian.org-ud-ldap changes.