HADOOP-6869. svn merge -c 979942 from trunk


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