Resync from oslo-incubator

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