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

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