[Git][openldap/openldap][mdb.master3] ITS#10095 partial revert of ITS#9278 2fd44e325195ae81664eb5dc36e7d265927c5ebc