YARN-953. Reverting for the sake of updating branch against latest trunk.


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