(ITS#8303)

[nivanova]

A new version of the patch with all fixes is uploaded as

ftp://ftp.openldap.org/incoming/nadezhda-ivanova-160130.patch