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

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