Sync for openstack contrib 1

Few minor tweaks to what Monty has done in order to ensure we can still create the manpage with the switch to pbr.

Also what do you think of the Acknowledges file?