Merge branch 'cs/#6988-zend-server-psr2-compliance'

Close #6988
PHPCS fixes for Zend\Stdlib
Merge branch 'cs/#6989-zend-stdlib-psr2-compliance' into develop

Close #6989
Forward port #6989