remove else in already return early
remove else in other because already return early
remove trailing_spaces
Merge branch 'fix/return-early' of git://github.com/samsonasik/zf2 into hotfix/3286
Merge branch 'hotfix/3286'

Close #3286