Merge proposals dependent on lp://staging/~sil2100/unity/fix-1043963-release

lp://staging/~sil2100/unity/fix-1043963-release has no merge proposals.