Port manifest changes from bug 1020440 and bug 1023484 to Thunderbird, r=port by build peer, a=bustage-fix