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