Port packaging changes for bug 850430 to Thunderbird, r=build fix by build system peer.