svn merge --ignore-ancestry -c 1556686 ../YARN-321 git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562156 13f79535-47bb-0310-9956-ffa450edef68
svn merge --ignore-ancestry -c 1556683 ../YARN-321 git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562154 13f79535-47bb-0310-9956-ffa450edef68