This change integrates most of the non-breaking work that we did in 2.1 including the updates to make Razor less coupled to MVC.