Merge branch 'cs/#6973-zend-inputfilter-psr2-compliance'

Close #6973
PHPCS fixes for Zend\Form
Merge branch 'hotfix/#6974-zend-form-psr2-compliance' into develop

Close #6974
Forward port #6974