Merge remote-tracking branch, resolve conflicts preserving FOCIL/Heze logic

- test_utils: Heze branch uses DataColumnSidecarGloas (shared format), keeps
  heze_enabled() check ahead of gloas_enabled() so Heze blocks are handled first
- genesis.rs: Keep both Gloas and Heze bid initialisation in genesis_block()

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

common/eth2/src/types.rs

@@ -1044,7 +1044,6 @@ impl SseDataColumnSidecar {
         let kzg_commitments: Vec<KzgCommitment> = match data_column_sidecar {
             DataColumnSidecar::Fulu(dc) => dc.kzg_commitments.to_vec(),
             DataColumnSidecar::Gloas(_) => vec![],
-            DataColumnSidecar::Heze(_) => vec![],
         };
         let versioned_hashes = kzg_commitments
             .iter()