Update the format of new/deprecated options

Also add new glance options from oslo.messaging that didn't make it in
the previous run of the script.

Change-Id: I937f3d57a7e995d99b2e13fafc660377f71f5d6b
Closes-Bug: 1354550
Merge "Update the format of new/deprecated options"