Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5

2 jobs for OPENLDAP_REL_ENG_2_5 in 28 minutes and 21 seconds (queued for 8 minutes and 48 seconds)