Added ability to compose collections via Zend Form annotations
Fixes cs
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