HDFS-5153. Merging r1563254 from trunk to branch-2. (Arpit Agarwal)

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