Update to latest oslo-incubator

The included changes to version.py are required for
correctly generating the versioninfo file.

Change-Id: I3534f4de099dc6d7462d896e9b18a8f776ee4daf
Switch to using version.canonical_version_string

Change-Id: Id095c61325b0d64bc77b742abf72958aeb4cde4d
Merge "Update to latest oslo-incubator"
Merge "Switch to using version.canonical_version_string"