YARN-953. Took the patch back after editing the conflicts.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/YARN-321@1557956 13f79535-47bb-0310-9956-ffa450edef68