Bug 963885 - Disable mozdevice tests in make check until we can address they way they cause builds to be RETRYed
No bug, Automated HSTS preload list update from host bld-centos6-hp-006 - a=hsts-update
No bug, Automated blocklist update from host bld-linux64-ec2-341 - a=blocklist-update
Merge m-c to s-c
Bug 963429 - Surface notification when Firefox Account needs user action. r=rnewman
Bug 963160 - Use server provided alternate email address. r=rnewman