Update oslo-incubator (except the db code)

There will be a follow up patch to migrate to oslo.db.

Change-Id: I7f61e89c733fb19a8a4a3b21060ea524b5ee5f2c
Merge "Update oslo-incubator (except the db code)"