Merge branch 'hotfix/3377' into develop

Close #3377
Merge branch 'improve-code-generators' of git://github.com/neeckeloo/zf2 into feature/3378
Merge branch 'feature/3378' into develop

Close #3378
Merge branch 'patch-2' of git://github.com/radnan/zf2 into hotfix/3385
[#3385] Update logic bloc
Merge branch 'hotfix/3385' into develop

Close #3385
Merge branch 'feature/3386' into develop

Forward port #3386
Merge branch 'hotfix/3396' into develop

Forward port #3396
Merge branch 'patch-3' of git://github.com/radnan/zf2 into hotfix/3405
[#3405] CS fixes

- Indentation, trailing whitespace
Merge branch 'hotfix/3405' into develop

Close #3405
Merge branch 'hotfix/3410' into develop

Forward port #3410
Merge branch 'hotfix/3415' into develop

Forward port #3415
Merge branch 'feature/file-input-comments' of git://github.com/cgmartin/zf2 into hotfix/3418
Merge branch 'hotfix/3418' into develop

Close #3418
Merge branch 'hotfix/3348' into develop

Forward port #3423
Merge branch 'hotfix/3424' into develop

Forward port #3424
Only change if status 200
Merge branch 'hotfix/3429' into develop

Forward port #3429
Merge branch 'hotfix/session-id-called-after-session-started' of git://github.com/mwillbanks/zf2 into hotfix/3430