Reverted use of ToV2FeedPackage helper in OData queries

Fixes #773
Merge pull request #775 from NuGet/preview

Reverted use of ToV2FeedPackage helper in OData queries
Merge branch 'dev' of https://github.com/NuGet/NuGetGallery into makePackageRestoreRobust