Reverting my accidental revert of MAPREDUCE-5059 in the previous commit of YARN-500 from branch-2.


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