yum-surrogate: promoted from extras to main, and related changes