HDFS-5297. Merging r1561854 from branch-2 to branch-2.3.

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