Drizzle

Merge proposals dependent on lp://qastaging/~brianaker/drizzle/trunk-update-april

  1. trunk-update-april
  2. Dependent merge proposals

lp://qastaging/~brianaker/drizzle/trunk-update-april has no merge proposals.