manual merges from openldap - upstream