Fixed wrong return usage and added @throws docblock
Merge branch 'hotfix/3283-master'

Close #3283
Merge branch 'return-fix' of git://github.com/iwalz/zf2 into hotfix/3285
[#3285] add return that was removed

- return after parent::connect
Merge branch 'hotfix/3285' into develop

Forward port #3285