Automatic merge from submit-queue Misc master and federation cleanups - misc small cleanups - make ServerRunOption embeddings explicit in order to make the technical debt in our plumbing code visible.
Automatic merge from submit-queue Misc master and federation cleanups - misc small cleanups - make ServerRunOption embeddings explicit in order to make the technical debt in our plumbing code visible.