Merge pull request #2108 from NuGet/danliu/testfix

Fix the last 3 functional test failures:
Merge branch 'master' of https://github.com/NuGet/NuGetGallery into danliu/testfix