Merge branch 'hotfix/4771'

Close #4771
Merge branch 'feature-form-factoryinjection' of github.com:tklever/zf2 into pr4666
Merge branch 'pr4666'
Close #4666
Fix Ini class comment block

Fix Ini class comment block from "XML" to "INI" for documentation purposes.
Merge branch 'hotfix/4791' into develop

Forward port #4791