U4-2295 Templates tree doesn't refresh and Master template stays at "None"

src/Umbraco.Web.UI/umbraco/settings/editTemplate.aspx

@@ -24,6 +24,7 @@
                 useMasterPages: <%=umbraco.UmbracoSettings.UseAspNetMasterPages.ToString().ToLower()%>,
                 templateId: <%= Request.QueryString["templateID"] %>,
                 masterTemplateId: jQuery('#<%= MasterTemplate.ClientID %>').val(),
+                masterPageDropDown: $("#<%= MasterTemplate.ClientID %>"),
                 treeSyncPath: '<%=TemplateTreeSyncPath%>',
                 text: {
                     templateErrorHeader: "<%= umbraco.ui.Text("speechBubbles", "templateErrorHeader") %>",

src/Umbraco.Web.UI/umbraco_client/Editors/EditTemplate.js

@@ -102,7 +102,7 @@
             var self = this;
 
             umbraco.presentation.webservices.codeEditorSave.SaveTemplate(
-                templateName, templateAlias, codeVal, self._opts.templateId, self._opts.masterTemplateId,
+                templateName, templateAlias, codeVal, self._opts.templateId, this._opts.masterPageDropDown.val(),
                 function(t) { self.submitSucces(t); },
                 function(t) { self.submitFailure(t); });