rebase against latest yum@rhel6