Merge trunk into HDFS-1073. Needs a few edits post-merge due to inclusion of HDFS-2003.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/hdfs/branches/HDFS-1073@1134137 13f79535-47bb-0310-9956-ffa450edef68