merge default -> production

--HG--
branch : production
merge default -> production

--HG--
branch : production
bug 832074 - force otoro socorro json to specify nightly channel. r=catlee

--HG--
branch : production
Merge production -> default