Merge branch 'hotfix/#6968-#6790-remove-unused-mock-methods'

Close #6968
PHPCS fixes for Zend\Http
Merge branch 'cs/#6971-zend-http-psr2-compliance' into develop

Close #6971