HDFS-5406. Merge r1551093 and r1551110 from trunk to branch-2

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