[Git][openldap/openldap][master] ITS#9515 Apply ITS#9001 changes to datamorph