Merge branch 'cs/#6986-zend-ldap-psr2-compliance'

Close #6986
PHPCS fixes for Zend\Mail
Merge branch 'cs/#6987-zend-mail-psr2-compliance' into develop

Close #6987
Forward port #6987