Merge pull request #1872 from NuGet/qa

Qa -> Staging
Update functional tests for late changes made in I8.
Merge pull request #1882 from NuGet/staging

Staging -> QA (test only)