HDFS-6934: minor test adjustment.
HDFS-6934: Fix legacy short-circuit read.