Fix #2004 by updating to published versions of NuGet packages
Merge branch 'master' of https://github.com/NuGet/NuGetGallery

Conflicts:
	src/NuGetGallery/packages.config