AMBARI-16819 zookeeper-env template has incorrect name on UI. (atkach)

ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-env.xml

@@ -178,6 +178,7 @@
 
   <property>
     <name>content</name>
+    <display-name>accumulo-env template</display-name>
     <description>The template for a client accumulo-env.sh file.</description>
     <value>
 #! /usr/bin/env bash

ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-log4j.xml

@@ -61,6 +61,7 @@
 
   <property>
     <name>content</name>
+    <display-name>accumulo-log4j template</display-name>
     <description>Custom log4j.properties</description>
     <value>
 # Licensed to the Apache Software Foundation (ASF) under one or more

ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-env.xml

@@ -77,6 +77,7 @@
   </property>
   <property>
     <name>content</name>
+    <display-name>ams-env template</display-name>
     <value>
 # Set environment variables here.
 

ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-grafana-env.xml

@@ -68,6 +68,7 @@
   </property>
   <property>
     <name>content</name>
+    <display-name>ams-grafana-env template</display-name>
     <value>
 # Set environment variables here.
 

ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-grafana-ini.xml

@@ -42,6 +42,7 @@
 
   <property>
     <name>content</name>
+    <display-name>ams-grafana-ini template</display-name>
     <value>
 ##################### Grafana Configuration Example #####################
 #

ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml

@@ -152,6 +152,7 @@
   <!-- hbase-env.sh -->
   <property>
     <name>content</name>
+    <display-name>ams-hbase-env template</display-name>
     <description>This is the jinja template for hbase-env.sh file</description>
     <value>
 # Set environment variables here.

ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-log4j.xml

@@ -24,6 +24,7 @@
 
   <property>
     <name>content</name>
+    <display-name>ams-hbase-log4j template</display-name>
     <description>Custom log4j.properties</description>
     <value>
 # Licensed to the Apache Software Foundation (ASF) under one

ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-log4j.xml

@@ -22,6 +22,7 @@
 
   <property>
     <name>content</name>
+    <display-name>ams-log4j template</display-name>
     <description>Custom log4j.properties</description>
     <value>
 #

ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/atlas-env.xml

@@ -74,6 +74,7 @@
   <!-- metadata-env.sh -->
   <property>
     <name>content</name>
+    <display-name>atlas-env template</display-name>
     <description>This is the jinja template for metadata-env.sh file</description>
     <value>
 # The java implementation to use. If JAVA_HOME is not found we expect java and jar to be in path

ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/atlas-log4j.xml

@@ -36,6 +36,7 @@
 
   <property>
     <name>content</name>
+    <display-name>atlas-log4j template</display-name>
     <description>Custom log4j.properties</description>
     <value><![CDATA[<?xml version="1.0" encoding="UTF-8" ?>
 <!--

ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/falcon-env.xml

@@ -117,6 +117,7 @@
   <!-- falcon-env.sh -->
   <property>
     <name>content</name>
+    <display-name>falcon-env template</display-name>
     <description>This is the jinja template for falcon-env.sh file</description>
     <value>
 # The java implementation to use. If JAVA_HOME is not found we expect java and jar to be in path

ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/configuration/flume-conf.xml

@@ -23,6 +23,7 @@
 <configuration supports_final="false" supports_adding_forbidden="true">
   <property>
     <name>content</name>
+    <display-name>flume-conf template</display-name>
     <description>Flume agent configurations. 
     Specifying the configuration here applies to all hosts in this configuration-group. Please use host specific configuration-groups to provide different configurations on different hosts. 
     For configuring multiple agents on the same host, provide the combined agent configurations here. Each agent should have a different name.</description>

ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/configuration/flume-env.xml

@@ -62,6 +62,7 @@
   <!-- flume-env.sh -->
   <property>
     <name>content</name>
+    <display-name>flume-env template</display-name>
     <description>This is the jinja template for flume-env.sh file</description>
     <value>
 # Licensed to the Apache Software Foundation (ASF) under one or more

ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml

@@ -135,6 +135,7 @@ and the -Xmn ratio (hbase_regionserver_xmn_ratio) exceeds this value.
   <!-- hbase-env.sh -->
   <property>
     <name>content</name>
+    <display-name>hbase-env template</display-name>
     <description>This is the jinja template for hbase-env.sh file</description>
     <value>
 # Set environment variables here.

ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-log4j.xml

@@ -24,6 +24,7 @@
 
   <property>
     <name>content</name>
+    <display-name>hbase-log4j template</display-name>
     <description>Custom log4j.properties</description>
     <value>
 # Licensed to the Apache Software Foundation (ASF) under one

ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hadoop-env.xml

@@ -222,6 +222,7 @@
   <!-- hadoop-env.sh -->
   <property>
     <name>content</name>
+    <display-name>hadoop-env template</display-name>
     <description>This is the jinja template for hadoop-env.sh file</description>
     <value>
 # Set Hadoop-specific environment variables here.

ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hdfs-log4j.xml

@@ -24,6 +24,7 @@
 
   <property>
     <name>content</name>
+    <display-name>hdfs-log4j template</display-name>
     <description>Custom log4j.properties</description>
     <value>
 #

ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hcat-env.xml

@@ -24,6 +24,7 @@
   <!-- hcat-env.sh -->
   <property>
     <name>content</name>
+    <display-name>hcat-env template</display-name>
     <description>This is the jinja template for hcat-env.sh file</description>
     <value>
       # Licensed to the Apache Software Foundation (ASF) under one

ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-env.xml

@@ -186,6 +186,7 @@
   <!-- hive-env.sh -->
   <property>
     <name>content</name>
+    <display-name>hive-env template</display-name>
     <description>This is the jinja template for hive-env.sh file</description>
     <value>
  if [ "$SERVICE" = "cli" ]; then

ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-exec-log4j.xml

@@ -24,6 +24,7 @@
 
   <property>
     <name>content</name>
+    <display-name>hive-exec-log4j template</display-name>
     <description>Custom hive-exec-log4j</description>
     <value>
 # Licensed to the Apache Software Foundation (ASF) under one

ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-log4j.xml

@@ -24,6 +24,7 @@
 
   <property>
     <name>content</name>
+    <display-name>hive-log4j template</display-name>
     <description>Custom log4j.properties</description>
     <value>
 # Licensed to the Apache Software Foundation (ASF) under one

ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/webhcat-env.xml

@@ -24,6 +24,7 @@
   <!-- webhcat-env.sh -->
   <property>
     <name>content</name>
+    <display-name>webhcat-env template</display-name>
     <description>webhcat-env.sh content</description>
     <value>
 # The file containing the running pid

ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/webhcat-log4j.xml

@@ -24,6 +24,7 @@
 
   <property>
     <name>content</name>
+    <display-name>webhcat-log4j template</display-name>
     <description>Custom webhcat-log4j.properties</description>
     <value>
 # Licensed to the Apache Software Foundation (ASF) under one

ambari-server/src/main/resources/common-services/KAFKA/0.8.1/configuration/kafka-env.xml

@@ -70,6 +70,7 @@
   <!-- kafka-env.sh -->
   <property>
     <name>content</name>
+    <display-name>kafka-env template</display-name>
     <description>This is the jinja template for kafka-env.sh file</description>
     <value>
 #!/bin/bash

ambari-server/src/main/resources/common-services/KAFKA/0.8.1/configuration/kafka-log4j.xml

@@ -24,6 +24,7 @@
 
   <property>
     <name>content</name>
+    <display-name>kafka-log4j template</display-name>
     <description>Custom log4j.properties</description>
     <value>
 #

ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/admin-topology.xml

@@ -25,6 +25,7 @@
 
     <property>
     <name>content</name>
+    <display-name>admin-topology template</display-name>
     <value>
     &lt;topology&gt;
 

ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/gateway-log4j.xml

@@ -24,6 +24,7 @@
 
   <property>
     <name>content</name>
+    <display-name>gateway-log4j template</display-name>
     <value>
 
       # Licensed to the Apache Software Foundation (ASF) under one

ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/ldap-log4j.xml

@@ -12,7 +12,7 @@
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
+ * Unless required by applicable law or agreed to in writing, software<display-name> template</display-name>
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
@@ -24,6 +24,7 @@
 
   <property>
     <name>content</name>
+    <display-name>ldap-log4j template</display-name>
     <value>
         # Licensed to the Apache Software Foundation (ASF) under one
         # or more contributor license agreements.  See the NOTICE file

ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/topology.xml

@@ -25,6 +25,7 @@
 
     <property>
     <name>content</name>
+    <display-name>topology template</display-name>
     <value>
         &lt;topology&gt;
 

ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/users-ldif.xml

@@ -24,6 +24,7 @@
 
     <property>
         <name>content</name>
+        <display-name>users-ldif template</display-name>
         <value>
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file

ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-env.xml

@@ -93,6 +93,7 @@
 
   <property>
     <name>content</name>
+    <display-name>logfeeder-env template</display-name>
     <description>This is the jinja template for logsearch-env.sh file</description>
     <value></value>
     <property-type>VALUE_FROM_PROPERTY_FILE</property-type>

ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-log4j.xml

@@ -25,6 +25,7 @@
   <!-- solrconfig.xml -->
   <property>
     <name>content</name>
+    <display-name>logfeeder-log4j template</display-name>
     <description>This is the jinja template for log4j.xml file for logfeeder</description>
     <value></value>
     <property-type>VALUE_FROM_PROPERTY_FILE</property-type>

ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-admin-json.xml

@@ -42,6 +42,7 @@
 
   <property>
     <name>content</name>
+    <display-name>logsearch-admin-json template</display-name>
     <description>This is the jinja template for logsearch-admin.json file</description>
     <value></value>
     <property-type>VALUE_FROM_PROPERTY_FILE</property-type>

ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-audit_logs-solrconfig.xml

@@ -51,6 +51,7 @@
   <!-- solrconfig.xml -->
   <property>
     <name>content</name>
+    <display-name>solrconfig template</display-name>
     <description>This is the jinja template for solrconfig.xml file for audit logs</description>
     <value></value>
     <property-type>VALUE_FROM_PROPERTY_FILE</property-type>

ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-env.xml

@@ -128,6 +128,7 @@
   <!-- logsearch-env.sh -->
   <property>
     <name>content</name>
+    <display-name>logsearch-env template</display-name>
     <description>This is the jinja template for logsearch-env.sh file</description>
     <value></value>
     <property-type>VALUE_FROM_PROPERTY_FILE</property-type>

ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-log4j.xml

@@ -26,6 +26,7 @@
   <!-- log4j.xml -->
   <property>
     <name>content</name>
+    <display-name>logsearch-log4j template</display-name>
     <description>This is the jinja template for log4j.xml file for logsearch server</description>
     <value></value>
     <property-type>VALUE_FROM_PROPERTY_FILE</property-type>

ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-service_logs-solrconfig.xml

@@ -50,6 +50,7 @@
   <!-- solrconfig.xml -->
   <property>
     <name>content</name>
+    <display-name>solrconfig template</display-name>
     <description>This is the jinja template for solrconfig.xml file for service logs</description>
     <value></value>
     <property-type>VALUE_FROM_PROPERTY_FILE</property-type>

ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-solr-client-log4j.xml

@@ -26,6 +26,7 @@
   <!-- log4j.xml -->
   <property>
     <name>content</name>
+    <display-name>log4j template</display-name>
     <description>This is the jinja template for log4j.properties file for logsearch solr client</description>
     <value></value>
     <property-type>VALUE_FROM_PROPERTY_FILE</property-type>

ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-solr-env.xml

@@ -138,6 +138,7 @@
   <!-- logsearch-solr-env.sh -->
   <property>
     <name>content</name>
+    <display-name>logsearch-solr-env template</display-name>
     <description>This is the jinja template for logsearch-solr-env.sh file</description>
     <value></value>
     <property-type>VALUE_FROM_PROPERTY_FILE</property-type>

ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-solr-log4j.xml

@@ -23,6 +23,7 @@
 
   <property>
     <name>content</name>
+    <display-name>logsearch-solr-log4j template</display-name>
     <description>This is the jinja template for log4j.properties</description>
     <value></value>
     <property-type>VALUE_FROM_PROPERTY_FILE</property-type>

ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-solr-xml.xml

@@ -23,6 +23,7 @@
 
   <property>
     <name>content</name>
+    <display-name>logsearch-solr-xml template</display-name>
     <description>This is the jinja template for logsearch solr.xml file</description>
     <value></value>
     <property-type>VALUE_FROM_PROPERTY_FILE</property-type>

ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/configuration/mahout-log4j.xml

@@ -24,6 +24,7 @@
 
     <property>
         <name>content</name>
+        <display-name>mahout-log4j template</display-name>
         <description>Custom log4j.properties</description>
         <value>
 #

ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-env.xml

@@ -122,6 +122,7 @@
   <!-- oozie-env.sh -->
   <property>
     <name>content</name>
+    <display-name>oozie-env template</display-name>
     <description>This is the jinja template for oozie-env.sh file</description>
     <value>
 #!/bin/bash

ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-log4j.xml

@@ -24,6 +24,7 @@
 
   <property>
     <name>content</name>
+    <display-name>oozie-log4j template</display-name>
     <description>Custom log4j.properties</description>
     <value>
 #

ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/configuration/oozie-env.xml

@@ -25,6 +25,7 @@
   <!-- oozie-env.sh -->
   <property>
     <name>content</name>
+    <display-name>oozie-env template</display-name>
     <description>This is the jinja template for oozie-env.sh file</description>
     <value>
 #!/bin/bash

ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/configuration/oozie-log4j.xml

@@ -24,6 +24,7 @@
 
   <property>
     <name>content</name>
+    <display-name>oozie-log4j template</display-name>
     <description>Custom log4j.properties</description>
     <value>
 #

ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/configuration/pig-env.xml

@@ -24,6 +24,7 @@
   <!-- pig-env.sh -->
   <property>
     <name>content</name>
+    <display-name>pig-env template</display-name>
     <description>This is the jinja template for pig-env.sh file</description>
     <value>
 JAVA_HOME={{java64_home}}

ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/configuration/pig-log4j.xml

@@ -24,6 +24,7 @@
 
   <property>
     <name>content</name>
+    <display-name>pig-log4j template</display-name>
     <description>Custom log4j.properties</description>
     <value>
 #

ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/configuration/pig-properties.xml

@@ -24,6 +24,7 @@
 
   <property>
     <name>content</name>
+    <display-name>pig-properties template</display-name>
     <description>Describe all the Pig agent configurations</description>
     <value>
 # Licensed to the Apache Software Foundation (ASF) under one

ambari-server/src/main/resources/common-services/PXF/3.0.0/configuration/pxf-profiles.xml

@@ -24,6 +24,7 @@
 
   <property>
     <name>content</name>
+    <display-name>pxf-profiles template</display-name>
     <description>PXF profiles definition file</description>
     <value><![CDATA[
 <?xml version="1.0" encoding="UTF-8"?>

ambari-server/src/main/resources/common-services/PXF/3.0.0/configuration/pxf-public-classpath.xml

@@ -24,6 +24,7 @@
 
   <property>
     <name>content</name>
+    <display-name>pxf-public-classpath template</display-name>
     <description>Classpath file for the PXF service.</description>
     <value>
 #

ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/admin-log4j.xml

@@ -22,6 +22,7 @@
 
     <property>
         <name>content</name>
+        <display-name>admin-log4j template</display-name>
         <description>admin-log4j.properties</description>
         <value>
 #

ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/tagsync-log4j.xml

@@ -22,6 +22,7 @@
 
     <property>
         <name>content</name>
+        <display-name>tagsync-log4j template</display-name>
         <description>tagsync-log4j.properties</description>
         <value>
 #

ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/usersync-log4j.xml

@@ -22,6 +22,7 @@
 
     <property>
         <name>content</name>
+        <display-name>usersync-log4j template</display-name>
         <description>usersync-log4j.properties</description>
         <value>
 #

ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-log4j.xml

@@ -22,6 +22,7 @@
 
   <property>
     <name>content</name>
+    <display-name>kms-log4j template</display-name>
     <description>kms-log4j.properties</description>
     <value>
 #

ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/configuration/slider-env.xml

@@ -24,6 +24,7 @@
   <!-- slider-env.sh -->
   <property>
     <name>content</name>
+    <display-name>slider-env template</display-name>
     <description>This is the jinja template for slider-env.sh file</description>
     <value>
 # Set Slider-specific environment variables here.

ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/configuration/slider-log4j.xml

@@ -24,6 +24,7 @@
 
   <property>
     <name>content</name>
+    <display-name>slider-log4j template</display-name>
     <description>Custom log4j.properties</description>
     <value>
 # Licensed to the Apache Software Foundation (ASF) under one

ambari-server/src/main/resources/common-services/SPARK/1.2.1/configuration/spark-env.xml

@@ -63,6 +63,7 @@
   <!-- spark-env.sh -->
   <property>
     <name>content</name>
+    <display-name>spark-env template</display-name>
     <description>This is the jinja template for spark-env.sh file</description>
     <value>
 #!/usr/bin/env bash

ambari-server/src/main/resources/common-services/SPARK/1.2.1/configuration/spark-log4j-properties.xml

@@ -22,6 +22,7 @@
 <configuration supports_final="false" supports_adding_forbidden="true">
   <property>
     <name>content</name>
+    <display-name>spark-log4j-properties template</display-name>
     <description>Spark-log4j-Properties</description>
     <value>
 # Set everything to be logged to the console

ambari-server/src/main/resources/common-services/SPARK/1.2.1/configuration/spark-metrics-properties.xml

@@ -21,6 +21,7 @@
 <configuration supports_final="true">
   <property>
     <name>content</name>
+    <display-name>spark-metrics-properties template</display-name>
     <description>Spark-metrics-properties</description>
     <value>
 # syntax: [instance].sink|source.[name].[options]=[value]

ambari-server/src/main/resources/common-services/SQOOP/1.4.4.2.0/configuration/sqoop-env.xml

@@ -24,6 +24,7 @@
   <!-- sqoop-env.sh -->
   <property>
     <name>content</name>
+    <display-name>sqoop-env template</display-name>
     <description>This is the jinja template for sqoop-env.sh file</description>
     <value>
 # Set Hadoop-specific environment variables here.

ambari-server/src/main/resources/common-services/STORM/0.10.0/configuration/storm-cluster-log4j.xml

@@ -24,6 +24,7 @@
 
   <property>
     <name>content</name>
+    <display-name>storm-cluster-log4j template</display-name>
     <description>Custom cluster.xml</description>
     <value>
     <![CDATA[

ambari-server/src/main/resources/common-services/STORM/0.10.0/configuration/storm-env.xml

@@ -34,6 +34,7 @@
   <!-- storm-env.sh -->
   <property>
     <name>content</name>
+    <display-name>storm-env template</display-name>
     <description>This is the jinja template for storm-env.sh file</description>
     <value>
       #!/bin/bash

ambari-server/src/main/resources/common-services/STORM/0.10.0/configuration/storm-worker-log4j.xml

@@ -24,6 +24,7 @@
 
   <property>
     <name>content</name>
+    <display-name>storm-worker-log4j template</display-name>
     <description>Custom worker.xml</description>
     <value>
     <![CDATA[

ambari-server/src/main/resources/common-services/STORM/0.9.1/configuration/storm-env.xml

@@ -104,6 +104,7 @@
   <!-- storm-env.sh -->
   <property>
     <name>content</name>
+    <display-name>storm-env template</display-name>
     <description>This is the jinja template for storm-env.sh file</description>
     <value>
 #!/bin/bash

ambari-server/src/main/resources/common-services/STORM/0.9.3/configuration/storm-env.xml

@@ -24,6 +24,7 @@
   <!-- storm-env.sh -->
   <property>
     <name>content</name>
+    <display-name>storm-env template</display-name>
     <description>This is the jinja template for storm-env.sh file</description>
     <value>
 #!/bin/bash

ambari-server/src/main/resources/common-services/TEZ/0.4.0.2.1/configuration/tez-env.xml

@@ -36,6 +36,7 @@
   <!-- tez-env.sh -->
   <property>
     <name>content</name>
+    <display-name>tez-env template</display-name>
     <description>This is the jinja template for tez-env.sh file</description>
     <value>
 # Tez specific configuration

ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration-mapred/mapred-env.xml

@@ -79,6 +79,7 @@
   <!-- mapred-env.sh -->
   <property>
     <name>content</name>
+    <display-name>mapred-env template</display-name>
     <description>This is the jinja template for mapred-env.sh file</description>
     <value>
 # export JAVA_HOME=/home/y/libexec/jdk1.6.0/

ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-env.xml

@@ -114,6 +114,7 @@
   <!-- yarn-env.sh -->
   <property>
     <name>content</name>
+    <display-name>yarn-env template</display-name>
     <description>This is the jinja template for yarn-env.sh file</description>
     <value>
 export HADOOP_YARN_HOME={{hadoop_yarn_home}}

ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-log4j.xml

@@ -24,6 +24,7 @@
 
   <property>
     <name>content</name>
+    <display-name>yarn-log4j template</display-name>
     <description>Custom log4j.properties</description>
     <value>
 #Relative to Yarn Log Dir Prefix

ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/configuration/zookeeper-env.xml

@@ -80,6 +80,7 @@
   <!-- zookeeper-env.sh -->
   <property>
     <name>content</name>
+    <display-name>zookeeper-env template</display-name>
     <description>This is the jinja template for zookeeper-env.sh file</description>
     <value>
 export JAVA_HOME={{java64_home}}

ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/configuration/zookeeper-log4j.xml

@@ -24,6 +24,7 @@
 
   <property>
     <name>content</name>
+    <display-name>zookeeper-log4j template</display-name>
     <description>Custom log4j.properties</description>
     <value>
 #

ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/GLUSTERFS/configuration/hadoop-env.xml

@@ -81,6 +81,7 @@
     <!-- hadoop-env.sh -->
   <property>
     <name>content</name>
+    <display-name>hadoop-env template</display-name>
     <description>This is the jinja template for hadoop-env.sh file</description>
     <value>
 # Set Hadoop-specific environment variables here.

ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/PIG/configuration/pig-properties.xml

@@ -24,6 +24,7 @@
 
   <property>
     <name>content</name>
+    <display-name>pig-properties template</display-name>
     <value>
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file

ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/YARN/configuration/yarn-env.xml

@@ -65,6 +65,7 @@
   <!-- yarn-env.sh -->
   <property>
     <name>content</name>
+    <display-name>yarn-env template</display-name>
     <description>This is the jinja template for yarn-env.sh file</description>
     <value>
 export HADOOP_YARN_HOME={{hadoop_yarn_home}}

ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/configuration/oozie-env.xml

@@ -25,6 +25,7 @@
   <!-- oozie-env.sh -->
   <property>
     <name>content</name>
+    <display-name>oozie-env template</display-name>
     <description>This is the jinja template for oozie-env.sh file</description>
     <value>
 #!/bin/bash

ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/GLUSTERFS/configuration/hadoop-env.xml

@@ -107,6 +107,7 @@
     <!-- hadoop-env.sh -->
   <property>
     <name>content</name>
+    <display-name>hadoop-env template</display-name>
     <description>This is the jinja template for hadoop-env.sh file</description>
     <value>
 # Set Hadoop-specific environment variables here.

ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/PIG/configuration/pig-properties.xml

@@ -24,6 +24,7 @@
 
   <property>
     <name>content</name>
+    <display-name>pig-properties template</display-name>
     <value>
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file

ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/YARN/configuration/yarn-env.xml

@@ -65,6 +65,7 @@
   <!-- yarn-env.sh -->
   <property>
     <name>content</name>
+    <display-name>yarn-env template</display-name>
     <description>This is the jinja template for yarn-env.sh file</description>
     <value>
 export HADOOP_YARN_HOME={{hadoop_yarn_home}}

ambari-server/src/main/resources/stacks/HDP/2.1/services/PIG/configuration/pig-properties.xml

@@ -24,6 +24,7 @@
 
   <property>
     <name>content</name>
+    <display-name>pig-properties template</display-name>
     <value>
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file

ambari-server/src/main/resources/stacks/HDP/2.1/services/YARN/configuration/yarn-env.xml

@@ -36,6 +36,7 @@
   <!-- yarn-env.sh -->
   <property>
     <name>content</name>
+    <display-name>yarn-env template</display-name>
     <description>This is the jinja template for yarn-env.sh file</description>
     <value>
 export HADOOP_YARN_HOME={{hadoop_yarn_home}}

ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-env.xml

@@ -105,6 +105,7 @@ and the -Xmn ratio (hbase_regionserver_xmn_ratio) exceeds this value.
   <!-- hbase-env.sh -->
   <property>
     <name>content</name>
+    <display-name>hbase-env template</display-name>
     <description>This is the jinja template for hbase-env.sh file</description>
     <value>
 # Set environment variables here.

ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml

@@ -43,6 +43,7 @@
   </property>
   <property>
     <name>content</name>
+    <display-name>hadoop-env template</display-name>
     <description>This is the jinja template for hadoop-env.sh file</description>
     <value>
 # Set Hadoop-specific environment variables here.

ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hdfs-log4j.xml

@@ -24,6 +24,7 @@
 
   <property>
     <name>content</name>
+    <display-name>hdfs-log4j template</display-name>
     <description>Custom log4j.properties</description>
     <value>
 #

ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-env.xml

@@ -39,6 +39,7 @@
   <!-- hive-env.sh -->
   <property>
     <name>content</name>
+    <display-name>hive-env template</display-name>
     <description>This is the jinja template for hive-env.sh file</description>
     <value>
  if [ "$SERVICE" = "cli" ]; then

ambari-server/src/main/resources/stacks/HDP/2.2/services/OOZIE/configuration/oozie-env.xml

@@ -24,6 +24,7 @@
   <!-- oozie-env.sh -->
   <property>
     <name>content</name>
+    <display-name>oozie-env template</display-name>
     <description>This is the jinja template for oozie-env.sh file</description>
     <value>
 #!/bin/bash

ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration-mapred/mapred-env.xml

@@ -26,6 +26,7 @@
   <!-- mapred-env.sh -->
   <property>
     <name>content</name>
+    <display-name>mapred-env template</display-name>
     <description>This is the jinja template for mapred-env.sh file</description>
     <value>
 # export JAVA_HOME=/home/y/libexec/jdk1.6.0/

ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/ECS/configuration/hadoop-env.xml

@@ -58,6 +58,7 @@
   <!-- hadoop-env.sh -->
   <property>
     <name>content</name>
+    <display-name>hadoop-env template</display-name>
     <description>This is the jinja template for hadoop-env.sh file</description>
     <value>
 # Set Hadoop-specific environment variables here.

ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/HBASE/configuration/hbase-env.xml

@@ -24,6 +24,7 @@
   <!-- hbase-env.sh -->
   <property>
     <name>content</name>
+    <display-name>hbase-env template</display-name>
     <description>This is the jinja template for hbase-env.sh file</description>
     <value>
 # Set environment variables here.

ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/ACCUMULO/configuration/accumulo-log4j.xml

@@ -61,6 +61,7 @@
 
   <property>
     <name>content</name>
+    <display-name>accumulo-log4j template</display-name>
     <description>Custom log4j.properties</description>
     <value>
 # Licensed to the Apache Software Foundation (ASF) under one or more

ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/GLUSTERFS/configuration/hadoop-env.xml

@@ -107,6 +107,7 @@
     <!-- hadoop-env.sh -->
   <property>
     <name>content</name>
+    <display-name>hadoop-env template</display-name>
     <description>This is the jinja template for hadoop-env.sh file</description>
     <value>
 # Set Hadoop-specific environment variables here.

ambari-server/src/main/resources/stacks/HDP/2.3/services/ACCUMULO/configuration/accumulo-log4j.xml

@@ -61,6 +61,7 @@
 
   <property>
     <name>content</name>
+    <display-name>accumulo-log4j template</display-name>
     <description>Custom log4j.properties</description>
     <value>
 # Licensed to the Apache Software Foundation (ASF) under one or more

ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/configuration/hbase-env.xml

@@ -24,6 +24,7 @@
   <!-- hbase-env.sh -->
   <property>
     <name>content</name>
+    <display-name>hbase-env template</display-name>
     <description>This is the jinja template for hbase-env.sh file</description>
     <value>
 # Set environment variables here.

ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/hadoop-env.xml

@@ -24,6 +24,7 @@
   <!-- hadoop-env.sh -->
   <property>
     <name>content</name>
+    <display-name>hadoop-env template</display-name>
     <description>This is the jinja template for hadoop-env.sh file</description>
     <value>
 # Set Hadoop-specific environment variables here.

ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/hive-env.xml

@@ -25,6 +25,7 @@
   <!-- hive-env.sh -->
   <property>
     <name>content</name>
+    <display-name>hive-env template</display-name>
     <description>This is the jinja template for hive-env.sh file</description>
     <value>
  if [ "$SERVICE" = "cli" ]; then

ambari-server/src/main/resources/stacks/HDP/2.3/services/KNOX/configuration/knoxsso-topology.xml

@@ -25,6 +25,7 @@
 
     <property>
     <name>content</name>
+    <display-name>knoxsso-topology template</display-name>
     <value>
       &lt;topology&gt;
       

ambari-server/src/main/resources/stacks/HDP/2.3/services/OOZIE/configuration/oozie-env.xml

@@ -25,6 +25,7 @@
   <!-- oozie-env.sh -->
   <property>
     <name>content</name>
+    <display-name>oozie-env template</display-name>
     <description>This is the jinja template for oozie-env.sh file</description>
     <value>
 #!/bin/bash

ambari-server/src/main/resources/stacks/HDP/2.3/services/PIG/configuration/pig-properties.xml

@@ -24,6 +24,7 @@
 
   <property>
     <name>content</name>
+    <display-name>pig-properties template</display-name>
     <value>
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file

ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-env.xml

@@ -28,6 +28,7 @@
   <!-- yarn-env.sh -->
   <property>
     <name>content</name>
+    <display-name>yarn-env template</display-name>
     <description>This is the jinja template for yarn-env.sh file</description>
     <value>
       export HADOOP_YARN_HOME={{hadoop_yarn_home}}

ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-log4j.xml

@@ -24,6 +24,7 @@
 
   <property>
     <name>content</name>
+    <display-name>yarn-log4j template</display-name>
     <description>Custom log4j.properties</description>
     <value>
 #Relative to Yarn Log Dir Prefix