Merge branch 'hotfix/3836'

Close #3836
Fixes #3832
Fix for legacy Transfer usage of File Validators
Merge branch 'fix/transfer-2.1' of git://github.com/cgmartin/zf2 into hotfix/3837
Merge branch 'hotfix/3837' into develop

Forward port #3837