Merge pull request #1919 from NuGet/staging

Staging -> Prod
Merge pull request #1946 from NuGet/staging

Staging -> Prod
Add two new tests.
Add new test.
Add new tests.
Merge pull request #1993 from NuGet/master

Master -> QA (3.0.3)
Various minor test updates.
Last test updates
Merge branch 'prod' into qa

Conflicts:
	tests/NuGetGallery.FunctionalTests/App.config
Merge branch 'qa'