svn merge -c 1584767 from trunk for the hadoop-common part of HDFS-6189.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1584771 13f79535-47bb-0310-9956-ffa450edef68