Merge branch 'hotfix/revert-5108' into develop

Reverts #5108 (hopefully temporarily)
Merge branch 'hotfix/5409' into develop

Forward port #5409
Merge pull request #5408 from Maks3w/hotfix/tests

Fixes for #5356
Merge branch 'hotfix/5408' into develop

Close #5408
Merge branch 'hotfix/5411' into develop

Forward port #5411
Merge branch 'hotfix/5412' into develop

Forward port #5412
Merge branch 'hotfix/5421' into develop

Forward port #5421
Fixes cs
Merge branch 'hotfix/5422' into develop

Forward port #5422
Merge branch 'hotfix/5418' into develop

Forward port #5418
Merge branch 'hotfix/5424' into develop

Forward port #5424
Merge pull request #5420 from carnage/master

Added ability to compose collections via Zend Form annotations
Merge branch 'feature/5420' into develop

Close #5420
Fixes #5410
ZendFilter harmonization
psr-2
psr-2
psr-2
psr-2
Filter part2
psr-2