(cherry picked from commit 742f9d90c00f823ad7fea7e79702fcf238fa5721) Conflicts: hadoop-mapreduce-project/CHANGES.txt hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/site/markdown/HistoryServerRest.md
(cherry picked from commit 742f9d90c00f823ad7fea7e79702fcf238fa5721) Conflicts: hadoop-mapreduce-project/CHANGES.txt hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/site/markdown/HistoryServerRest.md