Clean Up YAML anchors after conversion to extends
Summary
We need to go through and do some post-change cleanup after CI: Replace YAML anchors with extends and refer... (!6284 - merged) merges to:
- get rid of unnecessary anchors
- convert the last few items that are a bit more involved from anchors to
extends
keyword items
Deliverables
- merge request with necessary CI updates to get rid of YAML anchors we no longer use
- convert last few anchors to
extends
or document clearly why they cannot be converted with a comment