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>

beacon_node/network/src/sync/manager.rs

@@ -906,8 +906,8 @@ impl<T: BeaconChainTypes> SyncManager<T> {
                         );
                     }
                     // TODO(gloas) support gloas data column variant
-                    DataColumnSidecar::Gloas(_) | DataColumnSidecar::Heze(_) => {
-                        error!("Gloas/Heze variant not yet supported")
+                    DataColumnSidecar::Gloas(_) => {
+                        error!("Gloas variant not yet supported")
                     }
                 }
             }