Merging from trunk to branch-2.1-bata to fix YARN-742.

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