Revert "AMBARI-8174. Reverting all patches. (swagle)"

This reverts commit 24c39273ff0487c71f5688c14bf2ef8df9786210.

ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/utils.py

@@ -101,13 +101,13 @@ def service(action=None, name=None, user=None, create_pid_dir=False,
         except OSError:
           pass  # Process is not running
     pass
-  pass
 
-  # Set HADOOP_SECURE_DN_USER correctly in hadoop-env if DN is running as root
-  # in secure mode.
-  if name == 'datanode' and user == 'root':
-    params.dn_proc_user = 'root'
-    hdfs.setup_hadoop_env(replace=True)
+    # Set HADOOP_SECURE_DN_USER correctly in hadoop-env if DN is running as root
+    # in secure mode.
+    if user == 'root':
+      params.dn_proc_user = 'root'
+      hdfs.setup_hadoop_env(replace=True)
+    pass
   pass
 
   hadoop_env_exports_str = ''

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

@@ -136,7 +136,7 @@ export JAVA_LIBRARY_PATH=${JAVA_LIBRARY_PATH}
 export HADOOP_OPTS="-Dhdp.version=$HDP_VERSION $HADOOP_OPTS"
 
 HDFS_DN_PROC_USER={{dn_proc_user}}
-if [ $HDFS_DN_PROC_USER == "root" ]; then
+if [ $HDFS_DN_PROC_USER="root" ]; then
   export HADOOP_SECURE_DN_USER="{{hdfs_user}}"
 else
   export HADOOP_SECURE_DN_USER=""