Merge back from trunk to HDFS-2006

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2006@1592140 13f79535-47bb-0310-9956-ffa450edef68