Automatic merge from submit-queue (batch tested with PRs 40505, 34664, 37036, 40726, 41595) Rename provisioner config struct