Sync with oslo-incubator ad93e4e3

Change-Id: I441c29d5dda591a7d1fa1970edc69b0e97615a1e
Ensure `moniker-manage --version` reports the correct version number.

Change-Id: Iecd5f9192cb89f8f0c987bb374067350945b400a