YARN-516. Reverting the patch from branch-2 as HADOOP-9357 also got reverted.


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