YARN-899. Fixing the missed merge-conflict issue when merging from trunk to branch-2.


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