Merge "Sync versionutils from oslo-incubator"