Merge -r 759397:759398 from main to 0.18

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