Issue 841: Remove Microsoft.Web.Infrastructure references where possible (post 4.5 upgrade cleanups)