ITS#10125: fix bad merge From ac011b2c5a14d665b5756d8a7435627ffc508855
Merge remote-tracking branch 'origin/mdb.RE/0.9' into OPENLDAP_REL_ENG_2_6