YARN-1266. Added files that were forgotten in the last commit.
svn merge --ignore-ancestry -c 1544392 ../../branches/YARN-321-old/


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