CRUNCH-267: Fix several HFileUtils#scanHFiles related problems