No bug - Fix typo. r=typo
bug 968381 - diamond config ensures diamond package installation first. r=dustin
Merge default->production

--HG--
branch : production