Merge -r 1040882:1040883 from trunk onto 0.22 branch.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.22@1040884 13f79535-47bb-0310-9956-ffa450edef68
20 files changed