Add several missing options to the man page
Add several missing options to the man page

The bulk of this patch is based on suggestions by Robert P.J. Day,
as found here:
  https://bugzilla.redhat.com/show_bug.cgi?id=1266468

Change-Id: I6411adec228950623a3cc1269701d47df38e8e62

openstack-infra/git-review