Merge proposals dependent on lp://qastaging/~pete-woods/unity-scopes-shell/cmake-extras-compatibility

1. cmake-extras-compatibility
2. Dependent merge proposals