MAPREDUCE-5450. Merged to branch-1.2.

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