Fix FileUploadValidator to be compatible with the way 6.2 delivers information (partially addresses #1)