Unity

Merge proposals dependent on lp://qastaging/~thumper/unity/no-lambda-for-bug-964897

  1. no-lambda-for-bug-964897
  2. Dependent merge proposals

lp://qastaging/~thumper/unity/no-lambda-for-bug-964897 has no merge proposals.