Changes to support PageExecutionContext in Razor
Fixes #1083
Changes to make EnableInstrumentation conditionally enabled