Packaging fixes

Change-Id: I32ba6e43e58ee613353b814eb42b8321bb7519bf
Fixes: OPENSTACK-557