Merge proposals dependent on lp://qastaging/~cmpitg/tint2/trunk

lp://qastaging/~cmpitg/tint2/trunk has no merge proposals.