Fix Ini class comment block

Fix Ini class comment block from "XML" to "INI" for documentation purposes.
Merge branch 'feature-form-factoryinjection' of github.com:tklever/zf2 into hotfix/4666
Merge branch 'hotfix/4666' into develop

Forward port #4666
Merge branch 'hotfix/4791' into develop

Forward port #4791
Merge remote-tracking branch 'source/develop'