packaging: branding cleanup

Two changes to ease branding.

Change-Id: I62e31f8a50f7e1db575e9bd5f5388d4c60e5c34a
Signed-off-by: Alon Bar-Lev <alonbl@redhat.com>