svn merge -c 1293487 from trunk for HDFS-3006.


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