Merge branch 'cs/#6995-zend-servicemanager-psr2-compliance'

Close #6995
Added missing constants in Zend/Crypt/Key/Derivation/SaltedS2k
patch spelling
added old values for @deprecated
Merge branch 'hotfix/#6781-add-missing-hash-algorithm-constants-for-salted-derivation-key' into develop

Close #6781
Forward port #6781