HDFS-5003. Merging change r1504354 from branch-2.1-beta to branch-2.1.0-beta.

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