Merge branch 'its9584' into 'OPENLDAP_REL_ENG_2_5'

ITS#9584 backport for 2.5

See merge request !488
6 jobs for !488 with its9584 into OPENLDAP_REL_ENG_2_5 in 79 minutes and 57 seconds (queued for 1 second)
latest