BUG Upload: File versioning with existing files
reinsert oldFilePath = relativeFilePath in while loop
Merge branch 'pr/3570' into 3.1