Sync latest oslo-incubator

Change-Id: I150ece332cd1f26e9e7e47911a2a9dcaea2c45a7
Signed-off-by: Paul Belanger <paul.belanger@polybeacon.com>