Fix return tag and CS
Merge branch 'hotfix/4705'

Close #4705
Merge branch 'some-minor-fixes' of git://github.com/neeckeloo/zf2 into hotfix/4702
Merge branch 'hotfix/4702' into develop

Forward port #4702