Merge branch 'cs/#6971-zend-http-psr2-compliance'

Close #6971
PHPCS fixes for Zend\Json
Merge branch 'cs/#6972-zend-json-psr2-compliance' into develop

Close #6972
Forward port #6972