MAPREDUCE-5650. Job fails when hprof mapreduce.task.profile.map/reduce.params is specified (Gera Shegalov via Sandy Ryza)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1559201 13f79535-47bb-0310-9956-ffa450edef68
HDFS-5794. Fix the inconsistency of layout version number of ADD_DATANODE_AND_STORAGE_UUIDS between trunk and branch-2. Contributed by Jing Zhao.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1559209 13f79535-47bb-0310-9956-ffa450edef68
Move HDFS-5704 and HDFS-5777 to the correct section in CHANGES.txt

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1559210 13f79535-47bb-0310-9956-ffa450edef68
HADOOP-10235. Hadoop tarball has 2 versions of stax-api JARs. (tucu)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1559230 13f79535-47bb-0310-9956-ffa450edef68