Update to latest oslo-incubator

Change-Id: I2d67be195a5fff6589637c02eab0d15f7a745c0a
Merge "Update to latest oslo-incubator"