Merge branch 'cs/#6500-zend-barcode-psr2-compliance'

Close #6500
clear values on CollectionInputFilter before adding new data
add unit test for nested collections where the child collection is
different data
#6472 - removing trailing whitespace
#6472 - removing trailing whitespace, adding group annotation to new test method
Merge branch 'hotfix/#6472-always-clear-inputs-before-populating-inputfilter' into develop

Forward port #6472