Merge commit 'refs/changes/03/127603/4' of git://gold.eng.hq.xensource.com/git/github/openstack-dev/devstack into tmpbranch
Merge commit 'refs/changes/11/129211/1' of git://gold.eng.hq.xensource.com/git/github/openstack-dev/devstack into tmpbranch