unity-scopes-api

Merge proposals dependent on lp://qastaging/~stolowski/unity-scopes-api/fix-includes-trunk

  1. fix-includes-trunk
  2. Dependent merge proposals

lp://qastaging/~stolowski/unity-scopes-api/fix-includes-trunk has no merge proposals.