Merge proposals dependent on lp:~stewart/drizzle/multitenant

lp:~stewart/drizzle/multitenant has no merge proposals.