Packaging fixes

Change-Id: Ia6a65e3857badc6d2d798a16af9b3bba65b8bb94
Fixes: OPENSTACK-557