Merge proposals dependent on lp://qastaging/~gordallott/unity/fix-lp-878015

lp://qastaging/~gordallott/unity/fix-lp-878015 has no merge proposals.