Merge proposals dependent on lp://staging/~patrick-crews/drizzle/shar-qp-fix

lp://staging/~patrick-crews/drizzle/shar-qp-fix has no merge proposals.