Merge branch 'hotfix/#6160-collection-input-filter-count-fix-for-multiple-setdata-calls'

Close #6160
PHPCS fixes for Zend\Config
Merge branch 'cs/#6531-zend-config-psr2-compliance' into develop

Forward port #6531