Sync with latest module from oslo

- This add a few bugfixes for py3 support.

Change-Id: Ieb73d5f799423fa8abf71634c86601ba6d32df2f
Merge "Sync with latest module from oslo"