HDFS-1954. Merge -c 1134424 from trunk to branch 0.22.

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