Merge branch 'cs/#6980-zend-uri-psr2-compliance'

Close #6980
fix phpcs errors
Merge branch 'cs/#6981-zend-xmlrpc-psr2-compliance' into develop

Close #6981
Forward port #6981