Update from oslo-incubator

Change-Id: I16b9f94b74de927bb831f0f38483fb3909bbb3f7
Merge "Update from oslo-incubator"