Sync oslo-incubator for py33 fixes

Change-Id: I261ec6bb34b29169ba3547305deab051f85a3d4d
Merge "Sync oslo-incubator for py33 fixes"