Merge proposals dependent on lp://staging/~patrick-crews/drizzle/bug608416

lp://staging/~patrick-crews/drizzle/bug608416 has no merge proposals.