Merge branch 'cs/#6985-zend-mvc-psr2-compliance'

Close #6985
PHPCS fixes for Zend\Ldap
Merge branch 'cs/#6986-zend-ldap-psr2-compliance' into develop

Close #6986
Forward port #6986