Merge pull request #3460 branch 'hotfix/stdClass-name'
Fix #3289: Variable changed
fix for zendframework/zf2#3458
[#3461] CS fixes

- trailing whitespace
Merge branch 'hotfix/3461'

Backport #3461 to master
Merge commit 'refs/pull/3468/head' of github.com:zendframework/zf2 into hotfix/fix-variable
Forward port #3468