[Git][openldap/openldap][OPENLDAP_REL_ENG_2_4] ITS#9329 Re-fix merge_state