HDFS-1409. Merge -c 1134444 from trunk to branch 0.22.

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