[Git][openldap/openldap][master] ITS#8102, #9330 partially revert