Packaging fixes

Change-Id: I0f8ce1be5418174a1048d89db51739bb3e759174
Fixes: OPENSTACK-557