In bug 774985, Trevor mentioned that the following templates should be merged. The list is available in the following EtherPad. Please mark this bug as resolved after all of them have been taken care of. https://etherpad.mozilla.org/bo3PBrHogO
This one is pretty easy, if anyone has a few minutes to spare.