Merge branch 'cs/#7000-zend-modulemanager-psr2-compliance'

Close #7000
PHPCS fixes for Zend\Test
Merge branch 'cs/#7001-zend-test-psr2-compliance' into develop

Close #7001
Forward port #7001