Merge proposals dependent on lp://staging/~mfisch/onehundredscopes/unity-locoteams-scope-packaging

1. unity-locoteams-scope-packaging
2. Dependent merge proposals