svn merge -c 1293071 from trunk for HADOOP-8085.


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