(maint) Reconcile changes from FOSS RHEL7 mockstub with PE RHEL7 mockstubs

This will ensure we're using a consistently usable base when we try to build RHEL7 PE packages.