Update files from oslo-incubator

Change-Id: Iffc893407beddbf25d5b5c33a44581f3eb5dcded