Merge remote-tracking branch 'origin/use-right-disk-in-xen-pv' into baz
Merge remote-tracking branch 'origin/allow-root-conns-on-celery' into baz
Merge remote-tracking branch 'origin/assign-nodes-correctly' into baz
not using latest celery, since it raises exceptions on startup
Merge remote-tracking branch 'org/master' into use-stable-celery-version
Merge pull request #806 from shatterednirvana/use-stable-celery-version

Use stable celery version