Merge branch 'trunk' into HDFS-7240