Merge "Fix return type of UploadStash::listFiles"