Merge "Trove: Set appropriate service URLs"
Merge commit 'refs/changes/49/81849/2' of git://gold.eng.hq.xensource.com/git/github/openstack-dev/devstack into tmpbranch
Merge commit 'refs/changes/75/84475/1' of git://gold.eng.hq.xensource.com/git/github/openstack-dev/devstack into tmpbranch