Merge branch 'cs/#6984-zend-log-psr2-compliance'

Close #6984
PHPCS fixes for Zend\Mvc
Merge branch 'cs/#6985-zend-mvc-psr2-compliance' into develop

Close #6985
Forward port #6985