Merge branch 'cs/#6975-zend-i18n-psr2-compliance'

Close #6975
PHPCS fixes for Zend\Filter
Merge branch 'cs/#6976-zend-filter-psr2-compliance' into develop

Close #6976
Forward port #6976