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/branches/branch-2@1480361 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.
svn merge --ignore-ancestry -c 1480394 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1480396 13f79535-47bb-0310-9956-ffa450edef68
Merge remote branch 'origin/branch-2' into branch-2-gd
Merge remote branch 'origin/branch-2-gd' into fb-YAHOO-286-branch-2-gd