Merge branch 'typo/#6692-typo-in-form-select-view-helper'

Close #6692
PHPCS fixes for Zend\Di
Merge branch 'cs/#6698-zend-di-cs-fixes' into develop

Close #6698
Forward port #6698