ENG-6428: Fix handling of ondisk gen matching catalog generation.