Refined support for yum branch plugin

Similar to #13662