Merge proposals dependent on lp://qastaging/~smspillaz/unity/4.0_fix_912682

lp://qastaging/~smspillaz/unity/4.0_fix_912682 has no merge proposals.