Merge pull request #31456 from stbenjam/agent/scope-hypershift-etcd-leader-query