Remove useless override factories
move test file
Fix path in the file moved
Fix flag of console usage to restore initial param
Merge branch 'hotfix/3840'

Close #3840
Fixes #3823
Merge branch 'hotfix/zend-test-improve-console-usage' of git://github.com/blanchonvincent/zf2 into hotfix/3842
[#3842] CS fixes

- trailing whitespace
Merge branch 'hotfix/3842' into develop

Forward port #3842