svn merge -c 1516594 FIXES: Revert MAPREDUCE-5475


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