Update oslo-incubator

Change-Id: I4ad3a63a4a20746f4ecf46d5d9a31e3b3b69b65a
Merge "Update oslo-incubator"