Fixes frameworkType lookups.
Fixes failing unit tests.
Merge branch 'dotNetWebforms' into sbir-phase2