Bug 978187 - Update diamond spec file to correspond to reality. r=dustin
Add SeaMonkey HP's to nodes. r=node-only
Merge default->production

--HG--
branch : production