Changes to support Katello engine RPM builds