Merge branch 'master' into rebrand-compressed

Conflicts:
	src/NuGetGallery.Backend.Cloud/ServiceDefinition.csdef
	src/NuGetGallery/Web.config