HDFS-1107. Merge -r 939850:939851 from trunk to branch-0.21.

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