Merge remote-tracking branch 'origin/trunk' into HDFS-8966