Port changes due to bug 943511 to comm-central, rs=bustage-fix to reopen CLOSED TREE.

--HG--
extra : rebase_source : 8fee42a96d820081d1164cd39f201052f0501ac7