Apply the RHEL7 work and merge it into stable

As per @haus the updates for building Puppet packages on RHEL7 have been cherry-picked and applied to the `stable `branch.