Just a couple of minor packaging tweaks after 0.8, to make the release
work properly on the OpenStack CI system.