Refactor new yum reinstall support

This cleans up the new reinstall support that was merged yesterday.
Merge pull request #12829 from terminalmage/yumpkg-reinstall

Refactor new yum reinstall support