AMBARI-12230. During HDP 2.1 to 2.2.6 upgrade dfs.journalnode.edits.dir is incorrectly changed (aonishuk)

ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_1.3_to_2.2.json

@@ -481,7 +481,6 @@
           "dfs.namenode.checkpoint.txns": "1000000",
           "dfs.namenode.checkpoint.period": "21600",
           "dfs.namenode.checkpoint.edits.dir": "${dfs.namenode.checkpoint.dir}",
-          "dfs.journalnode.edits.dir": "/hadoop/hdfs/journalnode",
           "dfs.namenode.startup.delay.block.deletion.sec": "3600",
           "dfs.http.policy": "HTTP_ONLY",
           "dfs.namenode.name.dir.restore": "true",

ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_2.0_to_2.2.4.json

@@ -112,7 +112,6 @@
                 },
                 "hdfs-site": {
                     "dfs.datanode.max.transfer.threads": "16384",
-                    "dfs.journalnode.edits.dir": "/hadoop/hdfs/journalnode",
                     "dfs.namenode.handler.count": "100",
                     "dfs.namenode.startup.delay.block.deletion.sec": "3600"
                 },

ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_2.1_to_2.2.2.json

@@ -111,7 +111,6 @@
 		},
 		"hdfs-site": {
 		  "dfs.datanode.max.transfer.threads": "16384",
-          "dfs.journalnode.edits.dir": "/hadoop/hdfs/journalnode",
           "dfs.namenode.startup.delay.block.deletion.sec": "3600"  
 		},
 		"hive-env": {

ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_2.1_to_2.2.4.json

@@ -126,7 +126,6 @@
 		},
 		"hdfs-site": {
 		  "dfs.datanode.max.transfer.threads": "16384",
-		  "dfs.journalnode.edits.dir": "/hadoop/hdfs/journalnode",
 		  "dfs.namenode.handler.count": "100",
 		  "dfs.namenode.startup.delay.block.deletion.sec": "3600"
 		},