Merge "UploadBaseTest: Use setMwGlobals() instead of juggling globals"