Bug 870676 followup followup, fix followup bustage on a CLOSED TREE
Merge m-c to a CLOSED TREE fx-team