Merge branch 'hotfix/#6170-zend-xml-dependency-for-zend-xmlrpc'

Close #6170
Fix for odd php-cs-fixer finds
Merge branch 'hotfix/#6462-fix-phpcs-reported-errors' into develop

Forward port #6462