Merge branch 'cs/#6521-zend-cache-psr2-compliance'

Close #6521
swap order of initalization
#6505 - removing trailing whitespace
Merge branch 'hotfix/#6505-fix-null-pointer-in-inputfilter-factory' into develop

Forward port #6505