Packaging fixes

Change-Id: I86129aac843c5aabe1c1774758e653083787ddb9
Fixes: OPENSTACK-557