Fix gaps in the abstract shell to concrete migration
What does this MR do?
Identifies and fixes several gaps in our abstract shell -> concrete migration.
Best reviewed a commit at a time.
Why was this MR needed?
For the FF_SCRIPTS_TO_STEPS migration work.
What are the relevant issue numbers?
Closes #39403 (closed)
Edited by Arran Walker