Branching for HDFS-3140

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