Merge proposals dependent on lp://qastaging/~macslow/unity/unity.fix-838904-2

lp://qastaging/~macslow/unity/unity.fix-838904-2 has no merge proposals.