bug 968381 - enable diamond on amazon build instances. r=dustin
merge default->production

--HG--
branch : production