AMBARI-12840. Kerberos wizard sets AMS-HBase principals and keytabs as HBase duplicates. (jaimin)

ambari-web/app/controllers/wizard.js

@@ -1284,6 +1284,7 @@ App.WizardController = Em.Controller.extend(App.LocalStorage, App.ThemesMappingM
         }
         return {
           name: config.name,
+          filename: config.filename,
           value: config.value
         };
       });

ambari-web/app/mixins/wizard/addSecurityConfigs.js

@@ -382,7 +382,7 @@ App.AddSecurityConfigs = Em.Mixin.create({
    */
   shouldLoadClusterDescriptor: function() {
     return App.get('isKerberosEnabled') && !App.router.get('mainAdminKerberosController.defaultKerberosLoaded');
-  }.property('App.router.mainAdminKerberosController.securityEnabled', 'App.router.mainAdminKerberosController.defaultKerberosLoaded'),
+  }.property('App.isKerberosEnabled', 'App.router.mainAdminKerberosController.defaultKerberosLoaded'),
 
   /**
    * Make request for stack descriptor configs.

ambari-web/app/utils/config.js

@@ -1487,7 +1487,7 @@ App.config = Em.Object.create({
   mergeStoredValue: function(base, stored) {
     if (stored) {
       base.forEach(function (p) {
-        var sp = stored.findProperty("name", p.name);
+        var sp = stored.filterProperty("filename", p.filename).findProperty("name", p.name);
         if (sp) {
           p.set("value", sp.value);
         }