Merge "Pass user to FileRepo::getUploadStash"