Merge commit 'refs/changes/99/70999/4' of git://gold.eng.hq.xensource.com/git/github/openstack-dev/devstack into tmpbranch