Move HADOOP-4687 from branch to new trunk.

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