Fixes: U4-1599 [MVC] ChangeContentType doesn't work in macros rendered from a View -> We need to manually reset the ContentType after we execute a webforms based macro because Server.Execute resets the ContentType back to the default.
Merge branch '6.1.3' of https://github.com/umbraco/Umbraco-CMS into 6.1.3