HDFS-3418. svn merge -c 1338830 from trunk


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.0.0-alpha@1338832 13f79535-47bb-0310-9956-ffa450edef68
7 files changed