Drizzle

Merge proposals dependent on lp://qastaging/~sharan-monikantan/drizzle/trunk-bug-1048022

  1. trunk-bug-1048022
  2. Dependent merge proposals

lp://qastaging/~sharan-monikantan/drizzle/trunk-bug-1048022 has no merge proposals.