Automatic merge from submit-queue (batch tested with PRs 41023, 41031, 40947) scrub aggregator names to eliminate discovery Cleanup old uses of `discovery`. Also removes the legacy functionality. @kubernetes/sig-api-machinery-misc @sttts