HDFS-5317. Merging change 1530117 from branch-2

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