Update from oslo-incubator

From commit @d73f3b18b01b29205c98dbcb53dc9b49b6e2770c

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