HADOOP-4963. svn merge -c 746878 from branch-0.20 to branch-0.19


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