HDFS-5614: get tests passing for cases of file diff