Add missing @return annotations
Merge branch 'hotfix/3806'

Close #3806
Merge branch 'hotfix/missing-returns' of git://github.com/micheh/zf2 into hotfix/3808
Merge branch 'hotfix/3808' into develop

Forward port #3808