ITS#9308 - ensure "i" is initialized
Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5