Merge branch 'cs/#6532-zend-console-psr2-compliance'

Close #6532
PHPCS fixes for Zend\Navigation
Merge branch 'cs/#6536-zend-navigation-psr2-compliance' into develop

Forward port #6536