svn merge -c 1467120 FIXES: MAPREDUCE-5059. Change average merge time on Job overview page to be the time delta between the end of the shuffle and the start of the reduce. Contributed by Omkar Vinit Joshi


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1483885 13f79535-47bb-0310-9956-ffa450edef68
svn merge -c 1483974 FIXES: MAPREDUCE-4927. Historyserver 500 error due to NPE when accessing specific counters page for failed job. Contributed by Ashwin Shankar


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