Clean up version.suffix for master version
Preserve version.src property
Assert Upload#.upload()
Remove extra spacing
Fix AWS cleanup error
Add timeout to GM tests
Fix another AWS cleanup error