YARN-1303. Reverted the wrong patch committed earlier and committing the correct patch now. In one go.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1544029 13f79535-47bb-0310-9956-ffa450edef68