Merge proposals dependent on lp://qastaging/~fboucault/unity-webapps-qml/crossbuild_fixes

lp://qastaging/~fboucault/unity-webapps-qml/crossbuild_fixes has no merge proposals.