AMBARI-3029: Ambari clusters HBASE_CLASSPATH setting is resulting in different configs not getting used. (jaimin)

ambari-agent/src/main/puppet/modules/hdp-hbase/templates/hbase-env.sh.erb

@@ -25,7 +25,7 @@ export JAVA_HOME=<%=scope.function_hdp_java_home()%>
 export HBASE_CONF_DIR=${HBASE_CONF_DIR:-<%=scope.function_hdp_template_var("hbase_conf_dir")%>}
 
 # Extra Java CLASSPATH elements. Optional.
-export HBASE_CLASSPATH=${HBASE_CLASSPATH}:<%=scope.function_hdp_template_var("conf_dir")%>
+export HBASE_CLASSPATH=${HBASE_CLASSPATH}
 
 # The maximum amount of heap to use, in MB. Default is 1000.
 # export HBASE_HEAPSIZE=1000