Merge branch 'its9878re25' into 'OPENLDAP_REL_ENG_2_5'

ITS#9878 Workaround for streams that won't receive the fix (re25)

See merge request !545
3 jobs for !545 with its9878re25 into OPENLDAP_REL_ENG_2_5 in 41 minutes and 55 seconds (queued for 2 seconds)
latest