Merge commit 'refs/changes/03/127603/2' of git://gold.eng.hq.xensource.com/git/github/openstack-dev/devstack into tmpbranch
Merge commit 'refs/changes/16/128716/1' of git://gold.eng.hq.xensource.com/git/github/openstack-dev/devstack into tmpbranch
Merge commit 'refs/changes/17/128717/1' of git://gold.eng.hq.xensource.com/git/github/openstack-dev/devstack into tmpbranch
Merge commit 'refs/changes/18/128718/1' of git://gold.eng.hq.xensource.com/git/github/openstack-dev/devstack into tmpbranch