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