Merge branch 'cs/#6981-zend-xmlrpc-psr2-compliance'

Close #6981
fix PHPCS errors for Zend\Validator
Merge branch 'cs/#6982-zend-validator-psr2-compliance' into develop

Close #6982
Forward port #6982