Sync with oslo

This brings some bugfixes for Python 3 support.

Sync with 468afcb335a98dcfdc1520a73937982107bc2758

Change-Id: Ida73ae17b945e084a52b7024a91707f7729adfa1