Sync from oslo-incubator

Sync from oslo-incubator contains various python3 fixes.

Change-Id: I55e867450d65d9fa74fd6ef6ffece2bbb9f929cf
Signed-off-by: Chuck Short <chuck.short@canonical.com>
Merge "Sync from oslo-incubator"