Merge branch 'cs/#6536-zend-navigation-psr2-compliance'

Close #6536
PHPCS fixes for Zend\EventManager
Merge branch 'cs/#6535-zend-eventmanager-psr2-compliance' into develop

Forward port #6535