You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by dm...@apache.org on 2016/06/09 14:20:06 UTC

[46/94] ambari git commit: AMBARI-17112. Fixed implementation of on-ambari-upgrade support. Update all stack configuration xmls to pass validation (dlysnichenko)

AMBARI-17112. Fixed implementation of on-ambari-upgrade support. Update all stack configuration xmls to pass validation (dlysnichenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a998371a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a998371a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a998371a

Branch: refs/heads/branch-2.4
Commit: a998371a43f0cc0375092a2ab06a9001f7014930
Parents: 3f48719
Author: Lisnichenko Dmitro <dl...@hortonworks.com>
Authored: Thu Jun 9 17:06:54 2016 +0300
Committer: Lisnichenko Dmitro <dl...@hortonworks.com>
Committed: Thu Jun 9 17:15:48 2016 +0300

----------------------------------------------------------------------
 .../1.6.1.2.2.0/configuration/accumulo-env.xml  |  51 +-
 .../configuration/accumulo-log4j.xml            |  21 +-
 .../1.6.1.2.2.0/configuration/accumulo-site.xml |  51 +-
 .../0.1.0/configuration/ams-env.xml             |  21 +-
 .../0.1.0/configuration/ams-grafana-env.xml     |  18 +-
 .../0.1.0/configuration/ams-grafana-ini.xml     |  15 +-
 .../0.1.0/configuration/ams-hbase-env.xml       |  33 +-
 .../0.1.0/configuration/ams-hbase-log4j.xml     |   3 +-
 .../0.1.0/configuration/ams-hbase-policy.xml    |   9 +-
 .../configuration/ams-hbase-security-site.xml   |  51 +-
 .../0.1.0/configuration/ams-hbase-site.xml      | 150 ++----
 .../0.1.0/configuration/ams-log4j.xml           |   3 +-
 .../0.1.0/configuration/ams-site.xml            | 177 +++----
 .../0.1.0/configuration/ams-ssl-client.xml      |   9 +-
 .../0.1.0/configuration/ams-ssl-server.xml      |  24 +-
 .../0.1.0/configuration/storm-site.xml          |   3 +-
 .../configuration/application-properties.xml    | 105 ++---
 .../ATLAS/0.1.0.2.3/configuration/atlas-env.xml |  27 +-
 .../0.1.0.2.3/configuration/atlas-log4j.xml     |   9 +-
 .../0.5.0.2.1/configuration/falcon-env.xml      |  33 +-
 .../configuration/falcon-runtime.properties.xml |  15 +-
 .../configuration/falcon-startup.properties.xml |  93 ++--
 .../0.5.0.2.1/configuration/oozie-site.xml      |  24 +-
 .../1.4.0.2.0/configuration/flume-conf.xml      |   3 +-
 .../FLUME/1.4.0.2.0/configuration/flume-env.xml |  15 +-
 .../GANGLIA/3.5.0/configuration/ganglia-env.xml |  30 +-
 .../HAWQ/2.0.0/configuration/hawq-check-env.xml |   3 +-
 .../HAWQ/2.0.0/configuration/hawq-env.xml       |   6 +-
 .../2.0.0/configuration/hawq-limits-env.xml     |  12 +-
 .../HAWQ/2.0.0/configuration/hawq-site.xml      |  57 +--
 .../2.0.0/configuration/hawq-sysctl-env.xml     |  72 +--
 .../HAWQ/2.0.0/configuration/hdfs-client.xml    |  96 ++--
 .../HAWQ/2.0.0/configuration/yarn-client.xml    |  30 +-
 .../0.96.0.2.0/configuration/hbase-env.xml      |  39 +-
 .../0.96.0.2.0/configuration/hbase-log4j.xml    |   3 +-
 .../0.96.0.2.0/configuration/hbase-policy.xml   |   9 +-
 .../0.96.0.2.0/configuration/hbase-site.xml     | 114 ++---
 .../HDFS/2.1.0.2.0/configuration/core-site.xml  |  45 +-
 .../HDFS/2.1.0.2.0/configuration/hadoop-env.xml |  54 +--
 .../2.1.0.2.0/configuration/hadoop-policy.xml   |  33 +-
 .../HDFS/2.1.0.2.0/configuration/hdfs-log4j.xml |   3 +-
 .../HDFS/2.1.0.2.0/configuration/hdfs-site.xml  | 144 ++----
 .../HDFS/2.1.0.2.0/configuration/ssl-client.xml |  21 +-
 .../HDFS/2.1.0.2.0/configuration/ssl-server.xml |  24 +-
 .../HIVE/0.12.0.2.0/configuration/hcat-env.xml  |   3 +-
 .../HIVE/0.12.0.2.0/configuration/hive-env.xml  |  48 +-
 .../configuration/hive-exec-log4j.xml           |   3 +-
 .../0.12.0.2.0/configuration/hive-log4j.xml     |   3 +-
 .../HIVE/0.12.0.2.0/configuration/hive-site.xml | 147 ++----
 .../0.12.0.2.0/configuration/webhcat-env.xml    |   3 +-
 .../0.12.0.2.0/configuration/webhcat-log4j.xml  |   3 +-
 .../0.12.0.2.0/configuration/webhcat-site.xml   |  57 +--
 .../KAFKA/0.8.1/configuration/kafka-broker.xml  | 159 +++----
 .../KAFKA/0.8.1/configuration/kafka-env.xml     |  27 +-
 .../KAFKA/0.8.1/configuration/kafka-log4j.xml   |   3 +-
 .../KAFKA/0.9.0/configuration/kafka-broker.xml  |  69 +--
 .../KAFKA/0.9.0/configuration/kafka-env.xml     |   3 +-
 .../0.9.0/configuration/ranger-kafka-audit.xml  |  48 +-
 .../ranger-kafka-plugin-properties.xml          |  21 +-
 .../ranger-kafka-policymgr-ssl.xml              |  18 +-
 .../configuration/ranger-kafka-security.xml     |  18 +-
 .../1.10.3-10/configuration/kerberos-env.xml    |  75 +--
 .../1.10.3-10/configuration/krb5-conf.xml       |  12 +-
 .../0.5.0.2.2/configuration/admin-topology.xml  |   3 +-
 .../0.5.0.2.2/configuration/gateway-log4j.xml   |   3 +-
 .../0.5.0.2.2/configuration/gateway-site.xml    |  21 +-
 .../KNOX/0.5.0.2.2/configuration/knox-env.xml   |  18 +-
 .../KNOX/0.5.0.2.2/configuration/ldap-log4j.xml |   3 +-
 .../ranger-knox-plugin-properties.xml           |  93 ++--
 .../KNOX/0.5.0.2.2/configuration/topology.xml   |   3 +-
 .../KNOX/0.5.0.2.2/configuration/users-ldif.xml |   3 +-
 .../0.5.0/configuration/logfeeder-env.xml       |  42 +-
 .../0.5.0/configuration/logfeeder-log4j.xml     |   3 +-
 .../configuration/logfeeder-properties.xml      |  15 +-
 .../configuration/logsearch-admin-json.xml      |   9 +-
 .../logsearch-audit_logs-solrconfig.xml         |   9 +-
 .../0.5.0/configuration/logsearch-env.xml       |  54 +--
 .../0.5.0/configuration/logsearch-log4j.xml     |   3 +-
 .../configuration/logsearch-properties.xml      |  42 +-
 .../logsearch-service_logs-solrconfig.xml       |   9 +-
 .../logsearch-solr-client-log4j.xml             |   3 +-
 .../0.5.0/configuration/logsearch-solr-env.xml  |  57 +--
 .../configuration/logsearch-solr-log4j.xml      |   3 +-
 .../0.5.0/configuration/logsearch-solr-xml.xml  |   3 +-
 .../1.0.0.2.3/configuration/mahout-env.xml      |   3 +-
 .../1.0.0.2.3/configuration/mahout-log4j.xml    |   3 +-
 .../OOZIE/4.0.0.2.0/configuration/oozie-env.xml |  39 +-
 .../4.0.0.2.0/configuration/oozie-log4j.xml     |   3 +-
 .../4.0.0.2.0/configuration/oozie-site.xml      |  90 ++--
 .../OOZIE/4.2.0.2.3/configuration/oozie-env.xml |   3 +-
 .../4.2.0.2.3/configuration/oozie-log4j.xml     |   3 +-
 .../4.2.0.2.3/configuration/oozie-site.xml      |  45 +-
 .../PIG/0.12.0.2.0/configuration/pig-env.xml    |   3 +-
 .../PIG/0.12.0.2.0/configuration/pig-log4j.xml  |   3 +-
 .../0.12.0.2.0/configuration/pig-properties.xml |   3 +-
 .../PXF/3.0.0/configuration/pxf-profiles.xml    |   3 +-
 .../configuration/pxf-public-classpath.xml      |   3 +-
 .../PXF/3.0.0/configuration/pxf-site.xml        |   3 +-
 .../0.4.0/configuration/admin-properties.xml    |  75 +--
 .../RANGER/0.4.0/configuration/ranger-env.xml   |  60 +--
 .../RANGER/0.4.0/configuration/ranger-site.xml  |  21 +-
 .../0.4.0/configuration/usersync-properties.xml |  51 +-
 .../0.5.0/configuration/admin-properties.xml    |  45 +-
 .../0.5.0/configuration/ranger-admin-site.xml   | 167 +++----
 .../RANGER/0.5.0/configuration/ranger-env.xml   |  33 +-
 .../RANGER/0.5.0/configuration/ranger-site.xml  |  21 +-
 .../0.5.0/configuration/ranger-ugsync-site.xml  | 138 ++----
 .../0.5.0/configuration/usersync-properties.xml |  51 +-
 .../RANGER/0.6.0/configuration/admin-log4j.xml  |   3 +-
 .../0.6.0/configuration/admin-properties.xml    |   9 +-
 .../0.6.0/configuration/ranger-admin-site.xml   |  86 ++--
 .../RANGER/0.6.0/configuration/ranger-env.xml   |  12 +-
 .../0.6.0/configuration/ranger-tagsync-site.xml |  48 +-
 .../0.6.0/configuration/ranger-ugsync-site.xml  |  21 +-
 .../tagsync-application-properties.xml          |   9 +-
 .../0.6.0/configuration/tagsync-log4j.xml       |   3 +-
 .../0.6.0/configuration/usersync-log4j.xml      |   3 +-
 .../0.5.0.2.3/configuration/dbks-site.xml       |  33 +-
 .../0.5.0.2.3/configuration/kms-env.xml         |  15 +-
 .../0.5.0.2.3/configuration/kms-log4j.xml       |   3 +-
 .../0.5.0.2.3/configuration/kms-properties.xml  |  33 +-
 .../0.5.0.2.3/configuration/kms-site.xml        |  51 +-
 .../configuration/ranger-kms-audit.xml          |  48 +-
 .../configuration/ranger-kms-policymgr-ssl.xml  |  18 +-
 .../configuration/ranger-kms-security.xml       |  18 +-
 .../0.5.0.2.3/configuration/ranger-kms-site.xml |  21 +-
 .../0.60.0.2.2/configuration/slider-env.xml     |   3 +-
 .../0.60.0.2.2/configuration/slider-log4j.xml   |   3 +-
 .../1.2.1/configuration/spark-defaults.xml      |  51 +-
 .../SPARK/1.2.1/configuration/spark-env.xml     |  21 +-
 .../configuration/spark-log4j-properties.xml    |   3 +-
 .../configuration/spark-metrics-properties.xml  |   3 +-
 .../configuration/spark-hive-site-override.xml  |  15 +-
 .../configuration/spark-thrift-sparkconf.xml    |  30 +-
 .../1.6.0/configuration/spark-defaults.xml      |  15 +-
 .../spark-thrift-fairscheduler.xml              |   3 +-
 .../configuration/spark-thrift-sparkconf.xml    |  72 +--
 .../2.0.0/configuration/spark2-defaults.xml     |  30 +-
 .../SPARK2/2.0.0/configuration/spark2-env.xml   |  18 +-
 .../configuration/spark2-hive-site-override.xml |  15 +-
 .../configuration/spark2-log4j-properties.xml   |   3 +-
 .../configuration/spark2-metrics-properties.xml |   3 +-
 .../spark2-thrift-fairscheduler.xml             |   3 +-
 .../configuration/spark2-thrift-sparkconf.xml   |  45 +-
 .../SQOOP/1.4.4.2.0/configuration/sqoop-env.xml |   9 +-
 .../1.4.4.2.0/configuration/sqoop-site.xml      |   6 +-
 .../0.10.0/configuration/ranger-storm-audit.xml |  48 +-
 .../ranger-storm-plugin-properties.xml          |  75 +--
 .../ranger-storm-policymgr-ssl.xml              |  18 +-
 .../configuration/ranger-storm-security.xml     |  18 +-
 .../configuration/storm-cluster-log4j.xml       |   3 +-
 .../STORM/0.10.0/configuration/storm-env.xml    |   9 +-
 .../STORM/0.10.0/configuration/storm-site.xml   |  18 +-
 .../0.10.0/configuration/storm-worker-log4j.xml |   3 +-
 .../STORM/0.9.1/configuration/storm-env.xml     |  48 +-
 .../STORM/0.9.1/configuration/storm-site.xml    | 288 ++++--------
 .../ranger-storm-plugin-properties.xml          |  90 ++--
 .../STORM/0.9.3/configuration/storm-env.xml     |   3 +-
 .../STORM/0.9.3/configuration/storm-site.xml    |  42 +-
 .../1.0.1/configuration/ranger-storm-audit.xml  |  21 +-
 .../STORM/1.0.1/configuration/storm-site.xml    |  27 +-
 .../TEZ/0.4.0.2.1/configuration/tez-env.xml     |   6 +-
 .../TEZ/0.4.0.2.1/configuration/tez-site.xml    |  75 +--
 .../configuration-mapred/mapred-env.xml         |  21 +-
 .../configuration-mapred/mapred-site.xml        | 118 ++---
 .../configuration/capacity-scheduler.xml        |  39 +-
 .../YARN/2.1.0.2.0/configuration/yarn-env.xml   |  36 +-
 .../YARN/2.1.0.2.0/configuration/yarn-log4j.xml |   3 +-
 .../YARN/2.1.0.2.0/configuration/yarn-site.xml  | 117 ++---
 .../0.6.0.2.5/configuration/zeppelin-config.xml |  69 +--
 .../0.6.0.2.5/configuration/zeppelin-env.xml    |  30 +-
 .../ZOOKEEPER/3.4.5/configuration/zoo.cfg.xml   |  21 +-
 .../3.4.5/configuration/zookeeper-env.xml       |  21 +-
 .../3.4.5/configuration/zookeeper-log4j.xml     |   3 +-
 .../BIGTOP/0.8/configuration/cluster-env.xml    |  18 +-
 .../services/FLUME/configuration/flume-conf.xml |   3 +-
 .../services/FLUME/configuration/flume-env.xml  |  12 +-
 .../FLUME/configuration/flume-log4j.xml         |   3 +-
 .../GANGLIA/configuration/ganglia-env.xml       |  30 +-
 .../services/HBASE/configuration/hbase-env.xml  |  24 +-
 .../HBASE/configuration/hbase-log4j.xml         |   3 +-
 .../HBASE/configuration/hbase-policy.xml        |   9 +-
 .../services/HBASE/configuration/hbase-site.xml | 102 ++--
 .../services/HDFS/configuration/core-site.xml   |  39 +-
 .../services/HDFS/configuration/hadoop-env.xml  |  39 +-
 .../HDFS/configuration/hadoop-policy.xml        |  33 +-
 .../services/HDFS/configuration/hdfs-log4j.xml  |   3 +-
 .../services/HDFS/configuration/hdfs-site.xml   | 141 ++----
 .../services/HIVE/configuration/hcat-env.xml    |   3 +-
 .../services/HIVE/configuration/hive-env.xml    |  39 +-
 .../HIVE/configuration/hive-exec-log4j.xml      |   3 +-
 .../services/HIVE/configuration/hive-log4j.xml  |   3 +-
 .../services/HIVE/configuration/hive-site.xml   | 216 +++------
 .../services/HIVE/configuration/webhcat-env.xml |   3 +-
 .../HIVE/configuration/webhcat-site.xml         |  54 +--
 .../services/OOZIE/configuration/oozie-env.xml  |  24 +-
 .../OOZIE/configuration/oozie-log4j.xml         |   3 +-
 .../services/OOZIE/configuration/oozie-site.xml |  87 ++--
 .../0.8/services/PIG/configuration/pig-env.xml  |   3 +-
 .../services/PIG/configuration/pig-log4j.xml    |   3 +-
 .../PIG/configuration/pig-properties.xml        |   3 +-
 .../YARN/configuration-mapred/mapred-env.xml    |  15 +-
 .../YARN/configuration-mapred/mapred-site.xml   | 111 ++---
 .../YARN/configuration/capacity-scheduler.xml   |  39 +-
 .../services/YARN/configuration/yarn-env.xml    |  27 +-
 .../services/YARN/configuration/yarn-log4j.xml  |   3 +-
 .../services/YARN/configuration/yarn-site.xml   | 141 ++----
 .../ZOOKEEPER/configuration/zookeeper-env.xml   |  27 +-
 .../ZOOKEEPER/configuration/zookeeper-log4j.xml |   3 +-
 .../GLUSTERFS/configuration/core-site.xml       |  15 +-
 .../GLUSTERFS/configuration/hadoop-env.xml      |  30 +-
 .../services/HBASE/configuration/hbase-site.xml | 114 ++---
 .../services/HDFS/configuration/core-site.xml   |  36 +-
 .../services/HDFS/configuration/global.xml      | 102 ++--
 .../HDFS/configuration/hadoop-policy.xml        |  33 +-
 .../services/HDFS/configuration/hdfs-site.xml   | 174 +++----
 .../services/HIVE/configuration/hive-site.xml   | 213 +++------
 .../services/OOZIE/configuration/oozie-site.xml |  87 ++--
 .../PIG/configuration/pig-properties.xml        |   3 +-
 .../YARN/configuration-mapred/mapred-site.xml   |  33 +-
 .../YARN/configuration/capacity-scheduler.xml   |  39 +-
 .../services/YARN/configuration/yarn-env.xml    |  27 +-
 .../services/YARN/configuration/yarn-site.xml   | 141 ++----
 .../HDP/2.0.6/configuration/cluster-env.xml     |  72 +--
 .../services/OOZIE/configuration/oozie-env.xml  |   3 +-
 .../FALCON/configuration/falcon-env.xml         |  24 +-
 .../configuration/falcon-runtime.properties.xml |  15 +-
 .../configuration/falcon-startup.properties.xml | 102 ++--
 .../FALCON/configuration/oozie-site.xml         |  21 +-
 .../GLUSTERFS/configuration/core-site.xml       |   9 +-
 .../GLUSTERFS/configuration/hadoop-env.xml      |  30 +-
 .../services/HBASE/configuration/hbase-site.xml | 114 ++---
 .../services/HIVE/configuration/hive-site.xml   | 213 +++------
 .../services/OOZIE/configuration/oozie-site.xml |  87 ++--
 .../PIG/configuration/pig-properties.xml        |   3 +-
 .../services/STORM/configuration/storm-env.xml  |   9 +-
 .../services/STORM/configuration/storm-site.xml | 282 ++++-------
 .../services/TEZ/configuration/tez-env.xml      |   3 +-
 .../services/TEZ/configuration/tez-site.xml     |  75 +--
 .../YARN/configuration-mapred/mapred-site.xml   |  33 +-
 .../YARN/configuration-mapred/ssl-client.xml    |  21 +-
 .../YARN/configuration-mapred/ssl-server.xml    |  24 +-
 .../YARN/configuration/capacity-scheduler.xml   |  39 +-
 .../services/YARN/configuration/yarn-env.xml    |  27 +-
 .../services/YARN/configuration/yarn-site.xml   | 141 ++----
 .../FALCON/configuration/oozie-site.xml         |  24 +-
 .../services/HDFS/configuration/hdfs-site.xml   |   6 +-
 .../services/HIVE/configuration/hive-site.xml   | 225 +++------
 .../services/OOZIE/configuration/oozie-site.xml |  84 ++--
 .../PIG/configuration/pig-properties.xml        |   3 +-
 .../services/YARN/configuration/yarn-env.xml    |   6 +-
 .../services/YARN/configuration/yarn-site.xml   |  30 +-
 .../configuration/falcon-startup.properties.xml |  45 +-
 .../FALCON/configuration/oozie-site.xml         |  24 +-
 .../services/HBASE/configuration/hbase-env.xml  |  24 +-
 .../services/HBASE/configuration/hbase-site.xml |  54 +--
 .../ranger-hbase-plugin-properties.xml          |  93 ++--
 .../services/HDFS/configuration/core-site.xml   |   6 +-
 .../services/HDFS/configuration/hadoop-env.xml  |   9 +-
 .../services/HDFS/configuration/hdfs-log4j.xml  |   3 +-
 .../services/HDFS/configuration/hdfs-site.xml   |  15 +-
 .../ranger-hdfs-plugin-properties.xml           |  93 ++--
 .../services/HIVE/configuration/hive-env.xml    |  18 +-
 .../services/HIVE/configuration/hive-site.xml   | 465 ++++++------------
 .../HIVE/configuration/hiveserver2-site.xml     |  12 +-
 .../ranger-hive-plugin-properties.xml           |  93 ++--
 .../HIVE/configuration/webhcat-site.xml         |  45 +-
 .../ranger-knox-plugin-properties.xml           |   3 +-
 .../services/OOZIE/configuration/oozie-env.xml  |   3 +-
 .../services/OOZIE/configuration/oozie-site.xml |  18 +-
 .../services/STORM/configuration/storm-site.xml |  12 +-
 .../2.2/services/TEZ/configuration/tez-site.xml | 129 ++---
 .../YARN/configuration-mapred/mapred-env.xml    |   3 +-
 .../YARN/configuration-mapred/mapred-site.xml   |  33 +-
 .../YARN/configuration/capacity-scheduler.xml   |   9 +-
 .../services/YARN/configuration/yarn-env.xml    |   3 +-
 .../services/YARN/configuration/yarn-site.xml   | 186 +++-----
 .../services/ECS/configuration/core-site.xml    |  48 +-
 .../services/ECS/configuration/hadoop-env.xml   |  15 +-
 .../services/ECS/configuration/hdfs-site.xml    |   6 +-
 .../services/HBASE/configuration/hbase-env.xml  |   3 +-
 .../services/HBASE/configuration/hbase-site.xml |   3 +-
 .../services/TEZ/configuration/tez-site.xml     |   3 +-
 .../YARN/configuration-mapred/mapred-site.xml   |   3 +-
 .../services/YARN/configuration/yarn-site.xml   |   3 +-
 .../ACCUMULO/configuration/accumulo-log4j.xml   |  21 +-
 .../GLUSTERFS/configuration/core-site.xml       |  51 +-
 .../GLUSTERFS/configuration/hadoop-env.xml      |  30 +-
 .../services/HBASE/configuration/hbase-site.xml | 117 ++---
 .../services/HIVE/configuration/hive-site.xml   | 159 +++----
 .../HIVE/configuration/webhcat-site.xml         |  54 +--
 .../services/OOZIE/configuration/oozie-site.xml |  93 ++--
 .../services/TEZ/configuration/tez-site.xml     |  18 +-
 .../YARN/configuration-mapred/mapred-site.xml   |  33 +-
 .../YARN/configuration/capacity-scheduler.xml   |   9 +-
 .../services/YARN/configuration/yarn-site.xml   | 162 +++----
 .../ACCUMULO/configuration/accumulo-env.xml     |   3 +-
 .../ACCUMULO/configuration/accumulo-log4j.xml   |  21 +-
 .../ACCUMULO/configuration/accumulo-site.xml    |   3 +-
 .../FALCON/configuration/falcon-env.xml         |   3 +-
 .../configuration/falcon-startup.properties.xml |   3 +-
 .../services/HBASE/configuration/hbase-env.xml  |   3 +-
 .../services/HBASE/configuration/hbase-site.xml |  18 +-
 .../HBASE/configuration/ranger-hbase-audit.xml  |  48 +-
 .../ranger-hbase-plugin-properties.xml          |  78 ++--
 .../ranger-hbase-policymgr-ssl.xml              |  18 +-
 .../configuration/ranger-hbase-security.xml     |  21 +-
 .../services/HDFS/configuration/hadoop-env.xml  |   6 +-
 .../services/HDFS/configuration/hdfs-site.xml   |  12 +-
 .../HDFS/configuration/ranger-hdfs-audit.xml    |  48 +-
 .../ranger-hdfs-plugin-properties.xml           |  75 +--
 .../configuration/ranger-hdfs-policymgr-ssl.xml |  18 +-
 .../HDFS/configuration/ranger-hdfs-security.xml |  21 +-
 .../services/HIVE/configuration/hive-env.xml    |   3 +-
 .../services/HIVE/configuration/hive-site.xml   |  12 +-
 .../HIVE/configuration/ranger-hive-audit.xml    |  48 +-
 .../ranger-hive-plugin-properties.xml           |  78 ++--
 .../configuration/ranger-hive-policymgr-ssl.xml |  18 +-
 .../HIVE/configuration/ranger-hive-security.xml |  21 +-
 .../HIVE/configuration/webhcat-site.xml         |   6 +-
 .../ranger-kafka-policymgr-ssl.xml              |   6 +-
 .../KNOX/configuration/knoxsso-topology.xml     |   3 +-
 .../KNOX/configuration/ranger-knox-audit.xml    |  48 +-
 .../ranger-knox-plugin-properties.xml           |  75 +--
 .../configuration/ranger-knox-policymgr-ssl.xml |  18 +-
 .../KNOX/configuration/ranger-knox-security.xml |  18 +-
 .../services/OOZIE/configuration/oozie-env.xml  |   3 +-
 .../PIG/configuration/pig-properties.xml        |   3 +-
 .../RANGER/configuration/ranger-ugsync-site.xml |  12 +-
 .../configuration/ranger-kms-policymgr-ssl.xml  |   6 +-
 .../ranger-storm-policymgr-ssl.xml              |   6 +-
 .../configuration/ranger-storm-security.xml     |   3 +-
 .../services/STORM/configuration/storm-site.xml |  12 +-
 .../2.3/services/TEZ/configuration/tez-site.xml |  27 +-
 .../YARN/configuration-mapred/mapred-site.xml   |   9 +-
 .../YARN/configuration/capacity-scheduler.xml   |   3 +-
 .../YARN/configuration/ranger-yarn-audit.xml    |  48 +-
 .../ranger-yarn-plugin-properties.xml           |  18 +-
 .../configuration/ranger-yarn-policymgr-ssl.xml |  18 +-
 .../YARN/configuration/ranger-yarn-security.xml |  18 +-
 .../services/YARN/configuration/yarn-env.xml    |   6 +-
 .../services/YARN/configuration/yarn-log4j.xml  |   3 +-
 .../services/YARN/configuration/yarn-site.xml   |  42 +-
 .../services/YARN/configuration/yarn-site.xml   |   6 +-
 .../configuration/application-properties.xml    |  92 ++--
 .../services/ATLAS/configuration/atlas-env.xml  |  33 +-
 .../configuration/falcon-startup.properties.xml |  21 +-
 .../services/HBASE/configuration/hbase-site.xml |   3 +-
 .../HBASE/configuration/ranger-hbase-audit.xml  |  21 +-
 .../HDFS/configuration/ranger-hdfs-audit.xml    |  21 +-
 .../HIVE/configuration/beeline-log4j2.xml       |   3 +-
 .../services/HIVE/configuration/hive-env.xml    |   3 +-
 .../HIVE/configuration/hive-exec-log4j2.xml     |   3 +-
 .../HIVE/configuration/hive-interactive-env.xml |  33 +-
 .../configuration/hive-interactive-site.xml     | 147 ++----
 .../services/HIVE/configuration/hive-log4j2.xml |   3 +-
 .../services/HIVE/configuration/hive-site.xml   |   6 +-
 .../HIVE/configuration/hivemetastore-site.xml   |  12 +-
 .../HIVE/configuration/hiveserver2-site.xml     |  12 +-
 .../HIVE/configuration/llap-cli-log4j2.xml      |   3 +-
 .../HIVE/configuration/llap-daemon-log4j.xml    |   3 +-
 .../HIVE/configuration/ranger-hive-audit.xml    |  21 +-
 .../HIVE/configuration/tez-interactive-site.xml |  23 +-
 .../KAFKA/configuration/ranger-kafka-audit.xml  |  21 +-
 .../KNOX/configuration/knoxsso-topology.xml     |   3 +-
 .../KNOX/configuration/ranger-knox-audit.xml    |  21 +-
 .../configuration/ranger-tagsync-site.xml       |   6 +-
 .../RANGER/configuration/ranger-ugsync-site.xml |  15 +-
 .../RANGER_KMS/configuration/dbks-site.xml      |  21 +-
 .../RANGER_KMS/configuration/kms-env.xml        |   3 +-
 .../configuration/ranger-kms-audit.xml          |  27 +-
 .../services/SPARK/configuration/livy-conf.xml  |  60 +--
 .../services/SPARK/configuration/livy-env.xml   | 127 +++--
 .../configuration/livy-log4j-properties.xml     |  22 +-
 .../configuration/livy-spark-blacklist.xml      |  24 +-
 .../ranger-storm-policymgr-ssl.xml              |   6 +-
 .../configuration/ranger-storm-security.xml     |   3 +-
 .../services/STORM/configuration/storm-site.xml |  12 +-
 .../2.5/services/TEZ/configuration/tez-site.xml |   8 +-
 .../YARN/configuration/capacity-scheduler.xml   |   3 +-
 .../YARN/configuration/ranger-yarn-audit.xml    |  21 +-
 .../services/YARN/configuration/yarn-site.xml   |  12 +-
 .../ZEPPELIN/configuration/zeppelin-env.xml     |   3 +-
 .../HDPWIN/2.1/configuration/cluster-env.xml    |  24 +-
 .../AMBARI_METRICS/configuration/ams-env.xml    |  18 +-
 .../configuration/ams-hbase-env.xml             |  12 +-
 .../configuration/ams-hbase-site.xml            |   6 +-
 .../AMBARI_METRICS/configuration/ams-log4j.xml  |   3 +-
 .../AMBARI_METRICS/configuration/ams-site.xml   |   3 +-
 .../FALCON/configuration/falcon-env.xml         |  18 +-
 .../services/FLUME/configuration/flume-conf.xml |   3 +-
 .../services/FLUME/configuration/flume-env.xml  |   3 +-
 .../services/HBASE/configuration/hbase-env.xml  |  12 +-
 .../services/HBASE/configuration/hbase-site.xml |   6 +-
 .../services/HDFS/configuration/core-site.xml   |   3 +-
 .../services/HDFS/configuration/hadoop-env.xml  |  15 +-
 .../services/HDFS/configuration/hdfs-site.xml   |  27 +-
 .../services/HIVE/configuration/hcat-env.xml    |   3 +-
 .../services/HIVE/configuration/hive-env.xml    |  33 +-
 .../services/HIVE/configuration/hive-site.xml   | 123 ++---
 .../services/HIVE/configuration/webhcat-env.xml |   3 +-
 .../HIVE/configuration/webhcat-site.xml         |  21 +-
 .../services/OOZIE/configuration/oozie-env.xml  |  18 +-
 .../services/OOZIE/configuration/oozie-site.xml |  15 +-
 .../services/SQOOP/configuration/sqoop-env.xml  |   6 +-
 .../services/STORM/configuration/storm-env.xml  |  12 +-
 .../services/STORM/configuration/storm-site.xml |   6 +-
 .../2.1/services/TEZ/configuration/tez-env.xml  |   6 +-
 .../2.1/services/TEZ/configuration/tez-site.xml |   3 +-
 .../YARN/configuration-mapred/mapred-env.xml    |  12 +-
 .../YARN/configuration-mapred/mapred-site.xml   |   9 +-
 .../services/YARN/configuration/yarn-env.xml    |  12 +-
 .../services/YARN/configuration/yarn-site.xml   |  36 +-
 .../ZOOKEEPER/configuration/zoo.cfg.xml         |   3 +-
 .../ZOOKEEPER/configuration/zookeeper-env.xml   |  12 +-
 .../configuration/falcon-startup.properties.xml |  45 +-
 .../services/HBASE/configuration/hbase-env.xml  |   3 +-
 .../services/HBASE/configuration/hbase-site.xml |  30 +-
 .../services/HDFS/configuration/core-site.xml   |   3 +-
 .../services/HDFS/configuration/hadoop-env.xml  |   3 +-
 .../services/HDFS/configuration/hdfs-log4j.xml  |   3 +-
 .../services/HDFS/configuration/hdfs-site.xml   |   3 +-
 .../services/HIVE/configuration/hive-env.xml    |  18 +-
 .../services/HIVE/configuration/hive-site.xml   | 468 +++++++------------
 .../HIVE/configuration/hiveserver2-site.xml     |   9 +-
 .../HIVE/configuration/webhcat-site.xml         |  36 +-
 .../KNOX/configuration/gateway-site.xml         |   6 +-
 .../services/KNOX/configuration/knox-env.xml    |   9 +-
 .../ranger-knox-plugin-properties.xml           |   3 +-
 .../services/OOZIE/configuration/oozie-site.xml |  18 +-
 .../SLIDER/configurations/slider-client.xml     |   3 +-
 .../services/STORM/configuration/storm-site.xml |  30 +-
 .../2.2/services/TEZ/configuration/tez-site.xml | 114 ++---
 .../YARN/configuration-mapred/mapred-site.xml   |  33 +-
 .../YARN/configuration/capacity-scheduler.xml   |  15 +-
 .../services/YARN/configuration/yarn-env.xml    |   3 +-
 .../services/YARN/configuration/yarn-site.xml   | 168 +++----
 .../configuration/falcon-startup.properties.xml |   3 +-
 .../services/HBASE/configuration/hbase-site.xml |  18 +-
 .../services/HDFS/configuration/hdfs-site.xml   |   6 +-
 .../HIVE/configuration/webhcat-site.xml         |   3 +-
 .../services/OOZIE/configuration/oozie-env.xml  |  18 +-
 .../services/OOZIE/configuration/oozie-site.xml |  24 +-
 .../services/STORM/configuration/storm-site.xml |  18 +-
 .../2.3/services/TEZ/configuration/tez-site.xml |  24 +-
 .../YARN/configuration/capacity-scheduler.xml   |   9 +-
 .../services/HDFS/configuration/core-site.xml   |  15 +-
 .../services/HDFS/configuration/hdfs-site.xml   |  36 +-
 .../0.11.0.2.0.5.0/configuration/hive-site.xml  | 111 ++---
 .../HIVE/configuration/hive-site.xml            | 111 ++---
 .../services/HDFS/configuration/hbase-site.xml  |  45 +-
 .../services/HDFS/configuration/hdfs-site.xml   | 141 ++----
 .../MAPREDUCE/configuration/hbase-site.xml      |  45 +-
 .../MAPREDUCE/configuration/hdfs-site.xml       | 141 ++----
 .../MAPREDUCE/configuration/mapred-site.xml     | 141 ++----
 .../YARN/configuration/capacity-scheduler.xml   |   9 +-
 .../services/YARN/configuration/yarn-site.xml   |  15 +-
 .../HBASE/1.0/configuration/hbase-site.xml      |  45 +-
 .../HDFS/1.0/configuration/hbase-site.xml       |  45 +-
 .../HDFS/1.0/configuration/hdfs-site.xml        | 141 ++----
 .../MAPREDUCE/1.0/configuration/hbase-site.xml  |  45 +-
 .../MAPREDUCE/1.0/configuration/hdfs-site.xml   | 141 ++----
 .../MAPREDUCE/1.0/configuration/mapred-site.xml | 141 ++----
 .../services/HDFS/configuration/hbase-site.xml  |  45 +-
 .../services/HDFS/configuration/hdfs-site.xml   | 141 ++----
 .../MAPREDUCE/configuration/hbase-site.xml      |  45 +-
 .../MAPREDUCE/configuration/hdfs-site.xml       | 141 ++----
 .../MAPREDUCE/configuration/mapred-site.xml     | 141 ++----
 .../services/HBASE/configuration/hbase-site.xml |  45 +-
 .../0.2/services/HDFS/configuration/global.xml  |  72 +--
 .../services/HDFS/configuration/hadoop-env.xml  |  51 +-
 .../services/HDFS/configuration/hbase-site.xml  |  45 +-
 .../services/HDFS/configuration/hdfs-log4j.xml  |   3 +-
 .../services/HDFS/configuration/hdfs-site.xml   | 141 ++----
 .../services/MAPREDUCE/configuration/global.xml |  81 ++--
 .../MAPREDUCE/configuration/hbase-site.xml      |  45 +-
 .../MAPREDUCE/configuration/hdfs-site.xml       | 141 ++----
 .../MAPREDUCE/configuration/mapred-site.xml     | 141 ++----
 .../HBASE/configuration/hbase-policy.xml        |   9 +-
 .../services/HBASE/configuration/hbase-site.xml | 102 ++--
 .../services/HDFS/configuration/core-site.xml   |  51 +-
 .../HDFS/configuration/hadoop-policy.xml        |  33 +-
 .../services/HDFS/configuration/hdfs-site.xml   | 147 ++----
 .../services/HIVE/configuration/hive-site.xml   |  54 +--
 .../configuration/capacity-scheduler.xml        |  51 +-
 .../configuration/mapred-queue-acls.xml         |   6 +-
 .../MAPREDUCE/configuration/mapred-site.xml     | 219 +++------
 .../services/OOZIE/configuration/oozie-site.xml |  78 ++--
 .../WEBHCAT/configuration/webhcat-site.xml      |  48 +-
 .../services/GANGLIA/configuration/global.xml   |  18 +-
 .../services/HBASE/configuration/global.xml     |  90 ++--
 .../HBASE/configuration/hbase-policy.xml        |   9 +-
 .../services/HBASE/configuration/hbase-site.xml | 108 ++---
 .../services/HCATALOG/configuration/global.xml  |  12 +-
 .../services/HDFS/configuration/core-site.xml   |  51 +-
 .../services/HDFS/configuration/global.xml      | 105 ++---
 .../HDFS/configuration/hadoop-policy.xml        |  33 +-
 .../services/HDFS/configuration/hdfs-site.xml   | 150 ++----
 .../services/HIVE/configuration/global.xml      |  57 +--
 .../services/HIVE/configuration/hive-site.xml   |  99 ++--
 .../1.3.0/services/HUE/configuration/global.xml |   6 +-
 .../services/HUE/configuration/hue-site.xml     | 126 ++---
 .../configuration/capacity-scheduler.xml        |  51 +-
 .../services/MAPREDUCE/configuration/global.xml |  81 ++--
 .../configuration/mapred-queue-acls.xml         |   6 +-
 .../MAPREDUCE/configuration/mapred-site.xml     | 219 +++------
 .../services/OOZIE/configuration/global.xml     |  48 +-
 .../services/OOZIE/configuration/oozie-site.xml |  78 ++--
 .../WEBHCAT/configuration/webhcat-site.xml      |  48 +-
 .../services/ZOOKEEPER/configuration/global.xml |  30 +-
 .../HBASE/configuration/hbase-policy.xml        |   9 +-
 .../services/HBASE/configuration/hbase-site.xml |  99 ++--
 .../services/HCFS/configuration/core-site.xml   |  51 +-
 .../HCFS/configuration/hadoop-policy.xml        |  33 +-
 .../services/HCFS/configuration/hdfs-site.xml   | 147 ++----
 .../services/HDFS/configuration/core-site.xml   |  51 +-
 .../HDFS/configuration/hadoop-policy.xml        |  33 +-
 .../services/HDFS/configuration/hdfs-site.xml   | 147 ++----
 .../services/HIVE/configuration/hive-site.xml   |  54 +--
 .../configuration/capacity-scheduler.xml        |  51 +-
 .../configuration/mapred-queue-acls.xml         |   6 +-
 .../MAPREDUCE/configuration/mapred-site.xml     | 216 +++------
 .../services/OOZIE/configuration/oozie-site.xml |  78 ++--
 .../WEBHCAT/configuration/webhcat-site.xml      |  48 +-
 .../services/HDFS/configuration/hdfs-log4j.xml  |   3 +-
 .../HBASE/configuration/hbase-policy.xml        |   9 +-
 .../services/HBASE/configuration/hbase-site.xml | 102 ++--
 .../services/HDFS/configuration/core-site.xml   |  51 +-
 .../services/HDFS/configuration/global.xml      | 105 ++---
 .../HDFS/configuration/hadoop-policy.xml        |  33 +-
 .../services/HDFS/configuration/hdfs-site.xml   | 147 ++----
 .../services/HIVE/configuration/hive-site.xml   |  54 +--
 .../MAPREDUCE2/configuration/global.xml         |  12 +-
 .../configuration/mapred-queue-acls.xml         |   6 +-
 .../MAPREDUCE2/configuration/mapred-site.xml    | 120 ++---
 .../services/OOZIE/configuration/oozie-site.xml |  78 ++--
 .../WEBHCAT/configuration/webhcat-site.xml      |  48 +-
 .../YARN/configuration/capacity-scheduler.xml   |  33 +-
 .../services/YARN/configuration/global.xml      |  15 +-
 .../services/YARN/configuration/yarn-site.xml   |  78 ++--
 .../services/HBASE/configuration/global.xml     |  90 ++--
 .../HBASE/configuration/hbase-policy.xml        |   9 +-
 .../services/HBASE/configuration/hbase-site.xml | 111 ++---
 .../services/HDFS/configuration/core-site.xml   |  45 +-
 .../services/HDFS/configuration/global.xml      | 102 ++--
 .../HDFS/configuration/hadoop-policy.xml        |  33 +-
 .../services/HDFS/configuration/hdfs-site.xml   | 159 +++----
 .../services/HIVE/configuration/hive-site.xml   | 108 ++---
 .../MAPREDUCE2/configuration/global.xml         |  12 +-
 .../configuration/mapred-queue-acls.xml         |   6 +-
 .../MAPREDUCE2/configuration/mapred-site.xml    | 123 ++---
 .../services/OOZIE/configuration/oozie-site.xml |  78 ++--
 .../YARN/configuration/capacity-scheduler.xml   |  33 +-
 .../services/YARN/configuration/global.xml      |  24 +-
 .../services/YARN/configuration/yarn-site.xml   | 102 ++--
 .../services/ZOOKEEPER/configuration/global.xml |  30 +-
 .../ZOOKEEPER/configuration/zoo.cfg.xml         |  21 +-
 .../services/FLUME/configuration/flume-conf.xml |   3 +-
 .../services/FLUME/configuration/flume-env.xml  |   9 +-
 .../FLUME/configuration/flume-log4j.xml         |   3 +-
 .../services/FLUME/configuration/flume-conf.xml |   3 +-
 .../services/FLUME/configuration/flume-env.xml  |   9 +-
 .../FLUME/configuration/flume-log4j.xml         |   3 +-
 .../services/YARN/configuration/yarn-site.xml   |  27 +-
 .../services/HBASE/configuration/global.xml     |  87 ++--
 .../HBASE/configuration/hbase-policy.xml        |   9 +-
 .../services/HBASE/configuration/hbase-site.xml | 108 ++---
 .../services/HDFS/configuration/core-site.xml   |  36 +-
 .../services/HDFS/configuration/global.xml      | 105 ++---
 .../HDFS/configuration/hadoop-policy.xml        |  33 +-
 .../services/HDFS/configuration/hdfs-site.xml   | 177 +++----
 .../services/HIVE/configuration/hive-site.xml   | 111 ++---
 .../services/YARN/configuration/yarn-site.xml   |  15 +-
 .../services/HBASE/configuration/hbase-site.xml | 108 ++---
 .../services/HDFS/configuration/hdfs-site.xml   |   9 +-
 .../PIG/configuration/pig-properties.xml        |   3 +-
 .../services/HDFS/configuration/hdfs-site.xml   |   9 +-
 .../0.2/services/HDFS/configuration/global.xml  |  72 +--
 .../services/HDFS/configuration/hadoop-env.xml  |  51 +-
 .../services/HDFS/configuration/hbase-site.xml  |  45 +-
 .../services/HDFS/configuration/hdfs-log4j.xml  |   3 +-
 .../services/HDFS/configuration/hdfs-site.xml   | 141 ++----
 .../services/HDFS/configuration/hdfs-site.xml   |   9 +-
 583 files changed, 8239 insertions(+), 16401 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/a998371a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-env.xml b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-env.xml
index 500e331..4714fb3 100644
--- a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-env.xml
+++ b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-env.xml
@@ -32,8 +32,7 @@
       <type>password</type>
       <overridable>false</overridable>
     </value-attributes>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
   <property require-input="true">
     <name>instance_secret</name>
@@ -48,8 +47,7 @@
       <editable-only-at-install>true</editable-only-at-install>
       <overridable>false</overridable>
     </value-attributes>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
   <property require-input="false">
     <name>trace_password</name>
@@ -63,8 +61,7 @@
       <type>password</type>
       <overridable>false</overridable>
     </value-attributes>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
   <property>
     <name>accumulo_log_dir</name>
@@ -75,8 +72,7 @@
       <type>directory</type>
       <overridable>false</overridable>
     </value-attributes>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
   <property>
     <name>accumulo_pid_dir</name>
@@ -88,8 +84,7 @@
       <editable-only-at-install>true</editable-only-at-install>
       <overridable>false</overridable>
     </value-attributes>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
   <property>
     <name>accumulo_instance_name</name>
@@ -100,8 +95,7 @@
       <editable-only-at-install>true</editable-only-at-install>
       <overridable>false</overridable>
     </value-attributes>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
   <property>
     <name>accumulo_user</name>
@@ -113,8 +107,7 @@
       <type>user</type>
       <overridable>false</overridable>
     </value-attributes>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
   <property>
     <name>accumulo_master_heapsize</name>
@@ -126,8 +119,7 @@
       <unit>MB</unit>
       <overridable>false</overridable>
     </value-attributes>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
   <property>
     <name>accumulo_tserver_heapsize</name>
@@ -138,8 +130,7 @@
       <type>int</type>
       <unit>MB</unit>
     </value-attributes>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
   <property>
     <name>accumulo_monitor_heapsize</name>
@@ -151,8 +142,7 @@
       <unit>MB</unit>
       <overridable>false</overridable>
     </value-attributes>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
   <property>
     <name>accumulo_gc_heapsize</name>
@@ -164,8 +154,7 @@
       <unit>MB</unit>
       <overridable>false</overridable>
     </value-attributes>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
   <property>
     <name>accumulo_other_heapsize</name>
@@ -176,8 +165,7 @@
       <type>int</type>
       <unit>MB</unit>
     </value-attributes>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
   <property>
     <name>accumulo_monitor_bind_all</name>
@@ -187,20 +175,17 @@
     <value-attributes>
       <type>boolean</type>
     </value-attributes>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
   <property>
     <name>accumulo_user_keytab</name>
     <description>Accumulo keytab path</description>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
   <property>
     <name>accumulo_principal_name</name>
     <description>Accumulo principal name</description>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
   <property>
     <name>content</name>
@@ -226,8 +211,7 @@ export ACCUMULO_KILL_CMD='kill -9 %p'
     <value-attributes>
       <type>content</type>
     </value-attributes>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
   <property>
     <name>server_content</name>
@@ -255,7 +239,6 @@ export ACCUMULO_KILL_CMD='kill -9 %p'
     <value-attributes>
       <type>content</type>
     </value-attributes>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
 </configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/a998371a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-log4j.xml b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-log4j.xml
index cac3bd3..a8a6044 100644
--- a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-log4j.xml
+++ b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-log4j.xml
@@ -24,44 +24,38 @@
     <name>audit_log_level</name>
     <value>OFF</value>
     <description>Log level for audit logging</description>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
   <property>
     <name>monitor_forwarding_log_level</name>
     <value>WARN</value>
     <description>Log level for logging forwarded to the Accumulo
       Monitor</description>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
   <property>
     <name>debug_log_size</name>
     <value>512M</value>
     <description>Size of each debug rolling log file</description>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
   <property>
     <name>debug_num_logs</name>
     <value>10</value>
     <description>Number of rolling debug log files to keep</description>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
   <property>
     <name>info_log_size</name>
     <value>512M</value>
     <description>Size of each info rolling log file</description>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
   <property>
     <name>info_num_logs</name>
     <value>10</value>
     <description>Number of rolling info log files to keep</description>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
   <property>
     <name>content</name>
@@ -116,7 +110,6 @@ log4j.appender.A1.layout=org.apache.log4j.PatternLayout
       <type>content</type>
       <show-property-name>false</show-property-name>
     </value-attributes>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
 </configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/a998371a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-site.xml b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-site.xml
index 1342415..a2d3f65 100644
--- a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-site.xml
+++ b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-site.xml
@@ -27,8 +27,7 @@
     <value-attributes>
       <overridable>false</overridable>
     </value-attributes>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
   <property>
     <name>instance.zookeeper.host</name>
@@ -39,8 +38,7 @@
     <value-attributes>
       <overridable>false</overridable>
     </value-attributes>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
   <property>
     <name>instance.zookeeper.timeout</name>
@@ -49,8 +47,7 @@
     <value-attributes>
       <overridable>false</overridable>
     </value-attributes>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
   <property>
     <name>tserver.memory.maps.max</name>
@@ -60,8 +57,7 @@
       (tserver.memory.maps.native.enabled) this memory is
       off-heap. Ensure that table.compaction.minor.logs.threshold *
       tserver.walog.max.size &gt;= tserver.memory.maps.max.</description>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
   <property>
     <name>tserver.memory.maps.native.enabled</name>
@@ -72,37 +68,32 @@
     <value-attributes>
       <type>boolean</type>
     </value-attributes>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
   <property>
     <name>tserver.cache.data.size</name>
     <value>128M</value>
     <description>Size of on-heap block cache for data blocks.</description>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
   <property>
     <name>tserver.cache.index.size</name>
     <value>256M</value>
     <description>Size of on-heap block cache for index blocks.</description>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
   <property>
     <name>tserver.sort.buffer.size</name>
     <value>200M</value>
     <description>Amount of memory to use for sorting walogs when
       recovering from tserver failure.</description>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
   <property>
     <name>tserver.walog.max.size</name>
     <value>1G</value>
     <description>Maximum size of each write-ahead log.</description>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
   <property>
     <name>master.port.client</name>
@@ -111,8 +102,7 @@
     <value-attributes>
       <type>int</type>
     </value-attributes>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
   <property>
     <name>trace.port.client</name>
@@ -122,8 +112,7 @@
     <value-attributes>
       <type>int</type>
     </value-attributes>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
   <property>
     <name>tserver.port.client</name>
@@ -132,8 +121,7 @@
     <value-attributes>
       <type>int</type>
     </value-attributes>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
   <property>
     <name>gc.port.client</name>
@@ -143,8 +131,7 @@
     <value-attributes>
       <type>int</type>
     </value-attributes>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
   <property>
     <name>monitor.port.client</name>
@@ -153,8 +140,7 @@
     <value-attributes>
       <type>int</type>
     </value-attributes>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
   <property>
     <name>monitor.port.log4j</name>
@@ -164,8 +150,7 @@
     <value-attributes>
       <type>int</type>
     </value-attributes>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
   <property>
     <name>trace.user</name>
@@ -176,8 +161,7 @@
     <value-attributes>
       <overridable>false</overridable>
     </value-attributes>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
   <property>
     <name>general.classpaths</name>
@@ -203,7 +187,6 @@ $HADOOP_PREFIX/share/hadoop/yarn/lib/jersey.*.jar
     <value-attributes>
       <type>content</type>
     </value-attributes>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
 </configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/a998371a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-env.xml b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-env.xml
index 77e4931..8ce54dc 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-env.xml
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-env.xml
@@ -28,8 +28,7 @@
       <type>user</type>
       <overridable>false</overridable>
     </value-attributes>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
   <property>
     <name>metrics_collector_log_dir</name>
@@ -39,8 +38,7 @@
     <value-attributes>
       <type>directory</type>
     </value-attributes>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
   <property>
     <name>metrics_collector_pid_dir</name>
@@ -50,8 +48,7 @@
     <value-attributes>
       <type>directory</type>
     </value-attributes>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
   <property>
     <name>metrics_monitor_pid_dir</name>
@@ -61,8 +58,7 @@
     <value-attributes>
       <type>directory</type>
     </value-attributes>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
   <property>
     <name>metrics_monitor_log_dir</name>
@@ -72,8 +68,7 @@
     <value-attributes>
       <type>directory</type>
     </value-attributes>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
   <property>
     <name>metrics_collector_heapsize</name>
@@ -83,8 +78,7 @@
       <type>int</type>
       <unit>MB</unit>
     </value-attributes>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
   <property>
     <name>content</name>
@@ -136,7 +130,6 @@ export AMS_COLLECTOR_OPTS="$AMS_COLLECTOR_OPTS $AMS_COLLECTOR_GC_OPTS"
     <value-attributes>
       <type>content</type>
     </value-attributes>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
 </configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/a998371a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-grafana-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-grafana-env.xml b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-grafana-env.xml
index 036d83a..358403d 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-grafana-env.xml
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-grafana-env.xml
@@ -23,24 +23,21 @@
     <value>/var/log/ambari-metrics-grafana</value>
     <display-name>Metrics Grafana log dir</display-name>
     <description>Metrics Grafana log directory.</description>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
   <property>
     <name>metrics_grafana_pid_dir</name>
     <value>/var/run/ambari-metrics-grafana</value>
     <display-name>Metrics Grafana pid dir</display-name>
     <description>Metrics Grafana pid directory.</description>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
   <property>
     <name>metrics_grafana_data_dir</name>
     <value>/var/lib/ambari-metrics-grafana</value>
     <display-name>Metrics Grafana data dir</display-name>
     <description>Metrics Grafana data directory.</description>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
   <property>
     <name>metrics_grafana_username</name>
@@ -55,8 +52,7 @@
       <type>db_user</type>
       <overridable>false</overridable>
     </value-attributes>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
   <property require-input="true">
     <name>metrics_grafana_password</name>
@@ -72,8 +68,7 @@
       <overridable>false</overridable>
       <type>password</type>
     </value-attributes>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
   <property>
     <name>content</name>
@@ -93,7 +88,6 @@ export AMS_GRAFANA_LOG_DIR={{ams_grafana_log_dir}}
 # AMS UI Server PID Dir
 export AMS_GRAFANA_PID_DIR={{ams_grafana_pid_dir}}
     </value>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
 </configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/a998371a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-grafana-ini.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-grafana-ini.xml b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-grafana-ini.xml
index 2a29020..66b9de3 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-grafana-ini.xml
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-grafana-ini.xml
@@ -22,29 +22,25 @@
     <name>port</name>
     <value>3000</value>
     <description>The http port to use</description>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
   <property>
     <name>protocol</name>
     <value>http</value>
     <description>Protocol (http or https)</description>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
   <property>
     <name>cert_file</name>
     <value>/etc/ambari-metrics-grafana/conf/ams-grafana.crt</value>
     <description>Path to grafana certificate (.crt) file.</description>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
   <property>
     <name>cert_key</name>
     <value>/etc/ambari-metrics-grafana/conf/ams-grafana.key</value>
     <description>Path to grafana certificate key (.key) file.</description>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
   <property>
     <name>content</name>
@@ -308,7 +304,6 @@ org_name = Main Org.
 ;path = /var/lib/grafana/dashboards
 path = /usr/lib/ambari-metrics-grafana/public/dashboards
     </value>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
 </configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/a998371a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml
index c673b68..eaff9c2 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml
@@ -33,8 +33,7 @@
     <value-attributes>
       <type>directory</type>
     </value-attributes>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
   <property>
     <name>hbase_pid_dir</name>
@@ -43,8 +42,7 @@
     <value-attributes>
       <type>directory</type>
     </value-attributes>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
   <property>
     <name>hbase_classpath_additional</name>
@@ -53,8 +51,7 @@
     <value-attributes>
       <empty-value-valid>true</empty-value-valid>
     </value-attributes>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
   <property>
     <name>hbase_regionserver_heapsize</name>
@@ -77,8 +74,7 @@
         <name>hbase.rootdir</name>
       </property>
     </depends-on>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
   <property>
     <name>regionserver_xmn_size</name>
@@ -94,8 +90,7 @@
         <name>hbase.cluster.distributed</name>
       </property>
     </depends-on>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
   <property>
     <name>hbase_master_xmn_size</name>
@@ -113,8 +108,7 @@
         <name>hbase.cluster.distributed</name>
       </property>
     </depends-on>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
   <property>
     <name>hbase_master_maxperm_size</name>
@@ -124,15 +118,13 @@
       <type>int</type>
       <unit>MB</unit>
     </value-attributes>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
   <property>
     <name>hbase_regionserver_xmn_ratio</name>
     <value>0.2</value>
     <description>Percentage of max heap size (-Xmx) which used for young generation heap (-Xmn).</description>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
   <property>
     <name>hbase_master_heapsize</name>
@@ -155,8 +147,7 @@
         <name>hbase.rootdir</name>
       </property>
     </depends-on>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
   <property>
     <name>max_open_files_limit</name>
@@ -164,8 +155,7 @@
     <description>
         The maximum number of open file descriptors by process
     </description>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
   <!-- hbase-env.sh -->
   <property>
@@ -267,7 +257,6 @@ export HBASE_HOME={{ams_hbase_home_dir}}
     <value-attributes>
       <type>content</type>
     </value-attributes>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
 </configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/a998371a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-log4j.xml b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-log4j.xml
index ea4871a..5b1a2ff 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-log4j.xml
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-log4j.xml
@@ -141,7 +141,6 @@ log4j.logger.org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher=INFO
       <type>content</type>
       <show-property-name>false</show-property-name>
     </value-attributes>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
 </configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/a998371a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-policy.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-policy.xml b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-policy.xml
index e65df89..7892703 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-policy.xml
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-policy.xml
@@ -28,8 +28,7 @@
       The ACL is a comma-separated list of user and group names. The user and
       group list is separated by a blank. For e.g. "alice,bob users,wheel".
       A special value of "*" means all users are allowed.</description>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
   <property>
     <name>security.admin.protocol.acl</name>
@@ -39,8 +38,7 @@
       The ACL is a comma-separated list of user and group names. The user and
       group list is separated by a blank. For e.g. "alice,bob users,wheel".
       A special value of "*" means all users are allowed.</description>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
   <property>
     <name>security.masterregion.protocol.acl</name>
@@ -50,7 +48,6 @@
       The ACL is a comma-separated list of user and group names. The user and
       group list is separated by a blank. For e.g. "alice,bob users,wheel".
       A special value of "*" means all users are allowed.</description>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
 </configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/a998371a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-security-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-security-site.xml b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-security-site.xml
index 170448b..b55f481 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-security-site.xml
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-security-site.xml
@@ -26,8 +26,7 @@
     <value-attributes>
       <empty-value-valid>true</empty-value-valid>
     </value-attributes>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
   <property>
     <name>ams.zookeeper.principal</name>
@@ -35,8 +34,7 @@
     <value-attributes>
       <empty-value-valid>true</empty-value-valid>
     </value-attributes>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
   <property>
     <name>hadoop.security.authentication</name>
@@ -44,8 +42,7 @@
     <value-attributes>
       <empty-value-valid>true</empty-value-valid>
     </value-attributes>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
   <property>
     <name>hbase.coprocessor.master.classes</name>
@@ -53,8 +50,7 @@
     <value-attributes>
       <empty-value-valid>true</empty-value-valid>
     </value-attributes>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
   <property>
     <name>hbase.coprocessor.region.classes</name>
@@ -62,8 +58,7 @@
     <value-attributes>
       <empty-value-valid>true</empty-value-valid>
     </value-attributes>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
   <property>
     <name>hbase.master.kerberos.principal</name>
@@ -71,8 +66,7 @@
     <value-attributes>
       <empty-value-valid>true</empty-value-valid>
     </value-attributes>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
   <property>
     <name>hbase.master.keytab.file</name>
@@ -80,8 +74,7 @@
     <value-attributes>
       <empty-value-valid>true</empty-value-valid>
     </value-attributes>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
   <property>
     <name>hbase.myclient.keytab</name>
@@ -89,8 +82,7 @@
     <value-attributes>
       <empty-value-valid>true</empty-value-valid>
     </value-attributes>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
   <property>
     <name>hbase.myclient.principal</name>
@@ -98,8 +90,7 @@
     <value-attributes>
       <empty-value-valid>true</empty-value-valid>
     </value-attributes>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
   <property>
     <name>hbase.regionserver.kerberos.principal</name>
@@ -107,8 +98,7 @@
     <value-attributes>
       <empty-value-valid>true</empty-value-valid>
     </value-attributes>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
   <property>
     <name>hbase.regionserver.keytab.file</name>
@@ -116,8 +106,7 @@
     <value-attributes>
       <empty-value-valid>true</empty-value-valid>
     </value-attributes>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
   <property>
     <name>hbase.security.authentication</name>
@@ -125,8 +114,7 @@
     <value-attributes>
       <empty-value-valid>true</empty-value-valid>
     </value-attributes>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
   <property>
     <name>hbase.security.authorization</name>
@@ -134,8 +122,7 @@
     <value-attributes>
       <empty-value-valid>true</empty-value-valid>
     </value-attributes>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
   <property>
     <name>hbase.zookeeper.property.authProvider.1</name>
@@ -143,8 +130,7 @@
     <value-attributes>
       <empty-value-valid>true</empty-value-valid>
     </value-attributes>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
   <property>
     <name>hbase.zookeeper.property.jaasLoginRenew</name>
@@ -152,8 +138,7 @@
     <value-attributes>
       <empty-value-valid>true</empty-value-valid>
     </value-attributes>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
   <property>
     <name>hbase.zookeeper.property.kerberos.removeHostFromPrincipal</name>
@@ -161,8 +146,7 @@
     <value-attributes>
       <empty-value-valid>true</empty-value-valid>
     </value-attributes>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
   <property>
     <name>hbase.zookeeper.property.kerberos.removeRealmFromPrincipal</name>
@@ -170,7 +154,6 @@
     <value-attributes>
       <empty-value-valid>true</empty-value-valid>
     </value-attributes>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
+    <on-ambari-upgrade add="true" update="false" delete="false"/>
   </property>
 </configuration>