Merge "Sync in latest version of oslo"