Merge branch 'cs/#6992-zend-memory-cs-fixes'

Close #6992
PHPCS fixes for Zend\ServiceManager
Merge branch 'cs/#6995-zend-servicemanager-psr2-compliance' into develop

Close #6995
Forward port #6995