Merged r1206427 from branch-0.20-security for HADOOP-7854.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.20-security-205@1206428 13f79535-47bb-0310-9956-ffa450edef68
2 files changed