Packaging fixes

Change-Id: I10ba0630cea453cc9a24e8504c9f8fd2f7b23da1
Fixes: OPENSTACK-557