These changes were pulled out of the previous merge (cc_yum_add_repo) as they were unrelated there. Re-applying them here.