Merge proposals dependent on lp:~vjsamuel/drizzle/refactor-5-plugins

lp:~vjsamuel/drizzle/refactor-5-plugins has no merge proposals.