disable diamond on bld- and try- nodes due to missing /etc/diamond/ directory. r=bustage
merge default->production

--HG--
branch : production