sync oslo

Change-Id: I4569f14d71dd3823b49c51db5b417cc07a5e9609