HDFS-1199. svn merge -c 959827 from trunk


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