Sync latest stable/havana for oslo-incubator

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