Merge branch 'hotfix/#6974-zend-form-psr2-compliance'

Close #6974
PHPCS fixes for Zend\I18n
Merge branch 'cs/#6975-zend-i18n-psr2-compliance' into develop

Close #6975
Forward port #6975