Merge from Oslo-Incubator

This brings in the latest Python 3.x related
fixes from Oslo.

Change-Id: If0207d3b29038483098632586613bba9aeb803f7
Merge "Merge from Oslo-Incubator"