Merge proposals dependent on lp://staging/~savilerow-team/savilerow/unity-scope-tourism--fix-libdir-path

1. unity-scope-tourism--fix-libdir-path
2. Dependent merge proposals