Implement HDFS file merging in a per-entity fashion