YARN-646. Fix two typos in Fair Scheduler user guide. Contributed by Dapeng Sun.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1480360 13f79535-47bb-0310-9956-ffa450edef68
MAPREDUCE-5159. Change ValueAggregatorJob to add APIs which can support binary compatibility with hadoop-1 examples. Contributed by Zhijie Shen.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1480394 13f79535-47bb-0310-9956-ffa450edef68
Merge remote branch 'origin/trunk' into trunk-gd
Merge remote branch 'origin/trunk-gd' into fb-HADOOP-7435-trunk-gd