AMBARI-12343. Ambari storm deployment fails in secure mode due to storm principal name (rlevas)

ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/kerberos.json

@@ -12,7 +12,7 @@
         {
           "name": "storm_components",
           "principal": {
-            "value": "storm-${cluster_name}@${realm}",
+            "value": "${storm-env/storm_user}@${realm}",
             "type": "user",
             "configuration": "storm-env/storm_principal_name"
           },

ambari-web/app/assets/data/stacks/HDP-2.1/service_components.json

@@ -2492,7 +2492,7 @@
                 "configuration" : "storm-env/storm_principal_name",
                 "type" : "user",
                 "local_username" : null,
-                "value" : "storm-${cluster_name}@${realm}"
+                "value" : "${storm-env/storm_user}@${realm}"
               },
               "name" : "storm_components",
               "keytab" : {