Merge pull request #2091 from NuGet/danliu/testfix

Fix the EditPackage tests.