Changes to support Katello engine RPM builds

Depends on PR's #3503 and #3469