Automatic merge from submit-queue Renaming generic registry store from etcd->kvstore This is part of issue #17546, in preparation for multiple backend storage facilities, renaming the registry structs to reflect. xref: #1957