sync oslo changes for setup / version

this fixes the fact that run_tests.sh wouldn't work in a venv with
a clean cinder checkout. Yay for fixing being able to run tests.

Fixes bug #1125416

Change-Id: Ic341c3b878cc566f8d2f6a3b2c9d1fa62fc52261
Merge "sync oslo changes for setup / version"