Then we can perhaps leave EL clones + Fedora with one template and just RHEL on its own?  We'll then be able to leave puppet in %packages for EL clones + Fedora, and just do these workarounds in the RHEL one.