Merge -r 765015:765016 to move the change of HADOOP-5644 from trunk to branch 0.18.

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