Cherry pick a few changes to fix epel7 repo deployment