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

Close #6995
PHPCS fixes for Zend\Test