Resync oslo from upstream

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