Merge branch 'trunk' into HDFS-6581