Merge "DumpUploads: output local path instead of mwstore path"