Merge branch 'hotfix/#6743-if-spacing-psr2-compliance'

Close #6743
PHPCS fixes for Zend\Dom
Merge branch 'cs/#6699-zend-dom-psr-2-compat' into develop

Forward port #6699