Fix #1381 by using a more public way of handling OData URL rewriting.
Merge pull request #1382 from NuGet/anurse/1381-curatedfeedsbroken

Fix #1381 by using a more public way of handling OData URL rewriting.
Add unit tests and more robust replacement logic
Merge branch 'anurse/1381-curatedfeedsbroken' into qa