Fix minor doc block errors
Merge branch 'fix-doc-blocks' of git://github.com/neeckeloo/zf2 into hotfix/3363
Merge branch 'hotfix/3363' into develop

Close #3363