HADOOP-9855. Backport HADOOP-6578 to branch-1. Contributed by James Kinley. (harsh)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1@1513939 13f79535-47bb-0310-9956-ffa450edef68