Fix #1424 by cleaning up ownership transfer process
Fix test failures
Merge pull request #1588 from NuGet/anurse/1424-ownershiptransfer

Fix #1424 by cleaning up ownership transfer process