Merge "UploadBase: Replace 'emptyfile' warning code by 'empty-file'"