Merge proposals dependent on lp://qastaging/~henridv/unity/fix-for-bug-703067

lp://qastaging/~henridv/unity/fix-for-bug-703067 has no merge proposals.