Fixes: U4-2943 Insert macro dialog no longer works when editing mvc views, U4-2930 Get macro picker dialog working with partial views and partial view macros