Merge branch 'hotfix/#6743-if-spacing-psr2-compliance'

Close #6743
Merge branch 'master' of https://github.com/zendframework/zf2 into develop