Merge forward from trunk to branch HDFS-2832

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1552205 13f79535-47bb-0310-9956-ffa450edef68