Merge -r 1150859:1150860 from branch-0.20-security onto branch-0.20-security-204

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.20-security-204@1150862 13f79535-47bb-0310-9956-ffa450edef68
1 file changed