[Git][openldap/openldap][master] ITS#9201 partial revert