a few orchestratord refactors in preparation for adding additional controllers#34337

doy-materialize wants to merge 3 commits intomainMaterializeInc/materialize:mainfrom

push-wtyxknkkzltvMaterializeInc/materialize:push-wtyxknkkzltvCopy head branch name to clipboard