fix for zendframework/zf2#3458
[#3461] CS fixes

- trailing whitespace
Merge branch 'hotfix/3461'

Backport #3461 to master