bug 1011796 - aurora+beta+release merge day script. r=rail
bug 1028916: FxOS eng builds shouldn't receive updates - try to unset update channel for eng builds. r=aki
Merge bug 1028916 to production.

--HG--
branch : production