HDFS-5110. Merging change r1515630 from branch-2

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