I've now merged in almost all the recent changes (everything except "works in progress") from HEAD into OPENLDAP_REL_ENG_2_2 in preparation for the next general release. As there are many changes, please test this as much as possible. Report any problems through usual channels (e.g., ITS).
make test works and it seems you have also fixed ITS#2931. Hmm...
Ciao, Michael.