Cleanup test - checkin1
1. Combine the two UploadAndDownloadPackage tests.
2. Delete the never run UploadAndDownloadTestBombPackage test
3. Other minor fixes
merge
Merge branch 'danliu/testfix' of https://github.com/NuGet/NuGetGallery into danliu/testfix