Merge branch 'cs/#6987-zend-mail-psr2-compliance'

Close #6987
PHPCS fixes for Zend\Server
Merge branch 'cs/#6988-zend-server-psr2-compliance' into develop

Close #6988
Forward port #6988