Merge branch 'hotfix/5374-cleanup'

Fix CS and testing issues introduced by security fix for #5374
CS fixes

- trailing whitespace
Merge branch 'hotfix/cs' into develop

Fixes CS issues
fix squash
Issue #5395: remove unnecessary can create function and add logic to has()
Merge branch 'develop' of github.com:zendframework/zf2 into develop
Merge branch 'fix' into develop