svn merge -c 1561038 FIXES: Addendum patch for HADOOP-9652 to fix performance problems. Contributed by Andrew Wang


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