Final bug fixes for merge

app/authenticated/clusters/new/controller.js

@@ -49,6 +49,16 @@ export default Ember.Controller.extend({
   }).restartable().maxConcurrency(3),
 
   actions: {
+    cancelAddSystem() {
+      this.setProperties({
+        catalogInfo:       null,
+        _catalogInfoCache: null,
+        _prefetchInstance: null,
+        catalogId:         'all',
+        category:          null,
+        viewCatalog:       false,
+      });
+    },
     filterAction: function(catalogId){
       this.get('fetchTemplates').perform({
         "category": this.get('category'),

app/authenticated/clusters/new/route.js

@@ -19,4 +19,18 @@ export default Ember.Route.extend({
       });
     });
   },
+  teardownForComponentState: Ember.on('deactivate', function(){
+    this.controller.setProperties({
+      catalogItem:         null,
+      editCatalog:         false,
+      selectedTemplateUrl: null,
+      catalogInfo:         null,
+      _catalogInfoCache:   null,
+      _prefetchInstance:   null,
+      catalogId:           'all',
+      category:            null,
+      viewCatalog:         false,
+      newSystemStack:      null,
+    });
+  })
 });

app/authenticated/clusters/new/template.hbs

@@ -31,6 +31,9 @@
         cancel=(action "cancelEdit")
     }}
   {{else if viewCatalog}}
+    <div class="pull-right text-small">
+      <a role="button" class="btn bg-transparent p-0" {{action 'cancelAddSystem'}}>{{t 'editCluster.systemStacks.cancel'}}</a>
+    </div>
     {{catalog-index
         model=catalogInfo
         category=category

translations/en-us.yaml

@@ -1441,6 +1441,7 @@ editCluster:
     detail: These stacks will be automatically deployed into the System environment for the cluster.
     noData: No stacks will be deployed into the System environment.
     add: Add Stack
+    cancel: Cancel Add System Stack
 
 editContainer:
   title: