HDFS-1295. Port to yahoo-merge branch. (mattf)

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