Merge branch 'hotfix/6373'

Close #6373
Fixes #6300
Fix nested CollectionInputFilter not valid if count not specified

Conflicts:
	tests/ZendTest/InputFilter/CollectionInputFilterTest.php
[#6412] CS fixes (trailing whitespace)
Merge branch 'hotfix/6412' into develop

Forward port #6412