Merge -r 818320:818553 from branch 0.21 to the append branch.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/hdfs/branches/HDFS-265@818585 13f79535-47bb-0310-9956-ffa450edef68