Packaging updates for stable/hydrogen

Change-Id: Ia6f74a626fbc09da9c2336a24dfae681794f6f4c
Signed-off-by: Sam Hague <shague@redhat.com>
Merge "Packaging updates for stable/hydrogen" into stable/hydrogen