HDFS-278. Pull in changes from version 793364 from common.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/hdfs/trunk@793365 13f79535-47bb-0310-9956-ffa450edef68