Merge commit 'refs/changes/83/86083/2' of git://gold.eng.hq.xensource.com/git/github/openstack-dev/devstack into tmpbranch
Merge commit 'refs/changes/80/110280/1' of git://gold.eng.hq.xensource.com/git/github/openstack-dev/devstack into tmpbranch