Pull in tarball version fix from oslo.

Fixes bug 1103473.

Change-Id: I6ba67c2a8a0b7f3d488dc294882ef9f2c925bbf5
Merge "Pull in tarball version fix from oslo."