Un 'fixing' devstack

Change-Id: I24906056cae3d37917440ca8d2ac27c30060edea
Merge branch 'master' of https://github.com/openstack/trove-integration