Merge proposals dependent on lp:~brianaker/drizzle/deprecate-pbms

lp:~brianaker/drizzle/deprecate-pbms has no merge proposals.