Merge proposals dependent on lp://staging/~submarine/unity-scope-isgd/build-fixes

lp://staging/~submarine/unity-scope-isgd/build-fixes has no merge proposals.