Merge proposals dependent on lp://qastaging/~mozillateam/thunderbird/thunderbird-beta.precise

1. thunderbird-beta.precise
2. Dependent merge proposals