Pull in tarball version fix from oslo.

Fixes bug 1103473.

Change-Id: I6ba67c2a8a0b7f3d488dc294882ef9f2c925bbf5
Fixes 'not in' operator usage

Fixes bug #1111254

Change-Id: I297829049213732217332a969aa107525ac13600
Merge "Fixes 'not in' operator usage"
Merge "Pull in tarball version fix from oslo."