merge YARN-135 commit amendment from trunk. Add missing files from previous commit.


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