Unity

Merge proposals dependent on lp://qastaging/~gordallott/unity/unity-31-03-11-places-fixes

  1. unity-31-03-11-places-fixes
  2. Dependent merge proposals

lp://qastaging/~gordallott/unity/unity-31-03-11-places-fixes has no merge proposals.