[Git][openldap/openldap][master] 2 commits: ITS#9001 manual changes