Merge branch 'hotfix/#6443-fix-#6430-form-collection-element-count-fix'

Close #6443
Close #6430
PHPCS fixes for Zend\Barcode
Merge branch 'cs/#6500-zend-barcode-psr2-compliance' into develop

Forward port #6500