Merging change r1127697 for HADOOP-7322 from trunk


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