Merge branch 'cs/#6701-zend-file-psr2-compliance'

Close #6701
Fixes latest build on travis : master
Merge branch 'cs/#7078-cs-travis-failure-fixes' into develop

Close #7078
Forward port #7078