Packaging fixes

Change-Id: Ic0f9a0d8dbbf0294486a4125450de97d11bb2d9a
Fixes: OPENSTACK-557