Merge branch 'deps/#6631-zend-acl-suggest-zend-servicemanager'

Close #6631
PHPCS fixes for Zend\Log
Merge branch 'cs/#6984-zend-log-psr2-compliance' into develop

Close #6984
Forward port #6984