Merge branch 'cs/#6698-zend-di-cs-fixes'

Close #6698
PHPCS fixes for Zend\Feed
Merge branch 'cs/#6700-zend-feed-cs-fixes' into develop

Close #6700
Forward port #6700