Merge proposals dependent on lp://staging/~unity-api-team/unity-scopes-api/child-scopes-option

1. child-scopes-option
2. Dependent merge proposals