7f075f2b75
Contributed by zhihai xu. (cherry picked from commit 790a861766dcd60212d83f444f2f96d3acf20a94) Conflicts: hadoop-mapreduce-project/CHANGES.txt