Port bug 894903 to comm-central, r=port of build system change.
Port packaging changes for bug 913807, r=port by build-system peer

SeaMonkey has a CLOSED TREE packaging change.

--HG--
extra : amend_source : beea7892ec80cc269c08cbd4370ce46dc1b3335d