merge -r 1311379:1311380 Merging from trunk to branch-0.23 to fix HDFS-3119

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1441656 13f79535-47bb-0310-9956-ffa450edef68