[Git][openldap/openldap][OPENLDAP_REL_ENG_2_5] 42 commits: ITS#9515 Apply ITS#9001 changes to datamorph