AMBARI-4186. Global configs are not sent to server. (onechiporenko)

ambari-web/app/controllers/wizard/step8_controller.js

@@ -1395,11 +1395,15 @@ App.WizardStep8Controller = Em.Controller.extend({
   createConfigurations: function () {
     var selectedServices = this.get('selectedServices');
     if (this.get('content.controllerName') == 'installerController') {
-      this.get('serviceConfigTags').pushObject(this.createGlobalSiteObj());
       this.get('serviceConfigTags').pushObject(this.createCoreSiteObj());
       this.get('serviceConfigTags').pushObject(this.createHdfsSiteObj());
       this.get('serviceConfigTags').pushObject(this.createLog4jObj('HDFS'));
     }
+    var globalSiteObj = this.createGlobalSiteObj();
+    if (this.get('content.controllerName') == 'addServiceController') {
+      globalSiteObj.tag = 'version' + (new Date).getTime();
+    }
+    this.get('serviceConfigTags').pushObject(globalSiteObj);
     if (selectedServices.someProperty('serviceName', 'MAPREDUCE')) {
       this.get('serviceConfigTags').pushObject(this.createMrSiteObj());
       if (App.supports.capacitySchedulerUi) {
@@ -1536,9 +1540,6 @@ App.WizardStep8Controller = Em.Controller.extend({
         } else {
           globalSiteProperties[_globalSiteObj.name] = App.config.escapeXMLCharacters(_globalSiteObj.value);
         }
-        if (_globalSiteObj.name == 'java64_home') {
-          globalSiteProperties['java64_home'] = this.get('content.installOptions.javaHome');
-        }
       }
       this._recordHostOverrideFromObj(_globalSiteObj, 'global', 'version1', this);
     }, this);

ambari-web/app/data/HDP2/global_properties.js

@@ -1309,19 +1309,6 @@ module.exports =
       "category": "General",
       "belongsToService":[]
     },
-    {
-      "id": "puppet var",
-      "name": "java64_home",
-      "displayName": "Path to 64-bit JAVA_HOME",
-      "description": "Path to 64-bit JAVA_HOME.  /usr/jdk/jdk1.6.0_31 is the default used by Ambari.  You can override this to a specific path that contains the JDK.  Note that the path must be valid on ALL hosts in your cluster.",
-      "defaultValue": "/usr/jdk64/jdk1.6.0_31",
-      "isRequired": true,
-      "isReconfigurable": false,
-      "displayType": "directory",
-      "isVisible": false,
-      "serviceName": "MISC",
-      "belongsToService":[]
-    },
     {
       "id": "puppet var",
       "name": "hdfs_user",

ambari-web/app/data/global_properties.js

@@ -1231,19 +1231,6 @@ module.exports =
       "category": "General",
       "belongsToService": []
     },
-    {
-      "id": "puppet var",
-      "name": "java64_home",
-      "displayName": "Path to 64-bit JAVA_HOME",
-      "description": "Path to 64-bit JAVA_HOME.  /usr/jdk/jdk1.6.0_31 is the default used by Ambari.  You can override this to a specific path that contains the JDK.  Note that the path must be valid on ALL hosts in your cluster.",
-      "defaultValue": "/usr/jdk64/jdk1.6.0_31",
-      "isRequired": true,
-      "isReconfigurable": false,
-      "displayType": "directory",
-      "isVisible": false,
-      "serviceName": "MISC",
-      "belongsToService": []
-    },
     {
       "id": "puppet var",
       "name": "hdfs_user",