Packaging fixes

Change-Id: Ic5e5f3d61c052b458390d2982e0fafc3a1d28c73
Fixes: OPENSTACK-557