BRANCH:SP-1228- ability to upload file o custom folder using spt.html5up...

...load
That has to work with the existing kwarg subdir.. which is what is done when uploading a folder with subfolders.. so make sure your upload_dir condition is only replacing the part:
"%s/%s/%s" % (tmpdir, "upload", ticket)