Merge branch 'cs/#6976-zend-filter-psr2-compliance'

Close #6976
fix PHPCS errors for Zend\Test
Merge branch 'cs/#6978-zend-test-psr2-compliance' into develop

Close #6978
Forward port #6978