svn merge -c 1206180 from branch-0.20-security for HDFS-2590.


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