svn merge -c 1616018 FIXES: MAPREDUCE-6014. New task status field in task attempts table can lead to an empty web page. Contributed by Mit Desai


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616020 13f79535-47bb-0310-9956-ffa450edef68
Edit CHANGES.txt files to move HADOOP-10759 and HDFS-6717 from 2.5.0 to 2.6.0

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616037 13f79535-47bb-0310-9956-ffa450edef68