Merge proposals dependent on lp://qastaging/~unity-2d-team/unity-2d/fix-failing-ctests

lp://qastaging/~unity-2d-team/unity-2d/fix-failing-ctests has no merge proposals.