AMBARI-5368 HDP 2.1 install leaves deprecated params in mapred-site.xml, causes Hive failure (dsen)

ambari-server/src/main/resources/stacks/HDP/2.1/services/FALCON/metainfo.xml

@@ -21,7 +21,7 @@
     <service>
       <name>FALCON</name>
       <comment>Data management and processing platform</comment>
-      <version>0.4.0.2.1</version>
+      <version>0.5.0.2.1</version>
       <components>
         <component>
           <name>FALCON_CLIENT</name>

ambari-server/src/main/resources/stacks/HDP/2.1/services/HDFS/metainfo.xml

@@ -21,7 +21,7 @@
     <service>
       <name>HDFS</name>
       <comment>Apache Hadoop Distributed File System</comment>
-      <version>2.1.0.2.1</version>
+      <version>2.4.0.2.1</version>
     </service>
   </services>
 </metainfo>

ambari-server/src/main/resources/stacks/HDP/2.1/services/HIVE/configuration/mapred-site.xml

@@ -22,32 +22,32 @@
 
 <configuration>
   <property>
-    <name>mapred.reduce.parallel.copies</name>
+    <name>mapreduce.reduce.shuffle.parallelcopies</name>
     <value>30</value>
     <description></description>
   </property>
 
   <property>
-    <name>mapred.job.shuffle.input.buffer.percent</name>
+    <name>mapreduce.reduce.shuffle.input.buffer.percent</name>
     <value>0.6</value>
     <description></description>
   </property>
 
   <property>
-    <name>mapred.job.reduce.input.buffer.percent</name>
+    <name>mapreduce.reduce.input.buffer.percent</name>
     <value>0.2</value>
     <description></description>
   </property>
 
   <property>
-    <name>mapred.map.child.java.opts</name>
+    <name>mapreduce.map.java.opts</name>
     <value>-server -Xmx1536m -Djava.net.preferIPv4Stack=true -XX:+UseNUMA -XX:+UseParallelGC</value>
     <description></description>
   </property>
     
 
   <property>
-    <name>mapred.reduce.child.java.opts</name>
+    <name>mapreduce.reduce.java.opts</name>
     <value>-server -Xmx1536m -Djava.net.preferIPv4Stack=true -XX:+UseNUMA -XX:+UseParallelGC</value>
     <description></description>
   </property>

ambari-server/src/main/resources/stacks/HDP/2.1/services/OOZIE/metainfo.xml

@@ -22,7 +22,7 @@
       <name>OOZIE</name>
       <comment>System for workflow coordination and execution of Apache Hadoop jobs.  This also includes the installation of the optional Oozie Web Console which relies on and will install the &lt;a target="_blank" href="http://www.sencha.com/products/extjs/license/"&gt;ExtJS&lt;/a&gt; Library.
       </comment>
-      <version>4.1.0.2.1</version>
+      <version>4.0.0.2.1</version>
 
       <osSpecifics>
         <osSpecific>

ambari-server/src/main/resources/stacks/HDP/2.1/services/SQOOP/metainfo.xml

@@ -23,7 +23,7 @@
       <comment>Tool for transferring bulk data between Apache Hadoop and
         structured data stores such as relational databases
       </comment>
-      <version>1.4.5.2.1</version>
+      <version>1.4.4.2.1</version>
     </service>
   </services>
 </metainfo>

ambari-server/src/main/resources/stacks/HDP/2.1/services/YARN/metainfo.xml

@@ -22,7 +22,7 @@
         <service>
             <name>YARN</name>
             <comment>Apache Hadoop NextGen MapReduce (YARN)</comment>
-            <version>2.1.0.2.1</version>
+            <version>2.4.0.2.1</version>
             <components>
 
                 <component>