Merge branch 'cs/#6531-zend-config-psr2-compliance'

Close #6531
PHPCS fixes for Zend\Crypt
#6533 - removing redundant indentation on sprintf+exception throw
Merge branch 'cs/#6533-zend-crypt-psr2-compliance' into develop

Forward port #6533