Bug 981689 (Show a notice to beta users when we turn telemetry on by default on the beta channel) - For the new channel-override preference, use UpdateChannel.jsm rather than nsIXULRuntime so that it's easier to QA the feature by hacking install.js. As part of that, add a new argument to UpdateChannel.js for excluding partners. r=bsmbedberg.
Bug 1000719 - Add tracing on logging experiment rejections and telemetry tests. r=bsmedberg
Bug 994712 - fix CART regression caused by switch to Promise.jsm for Task.jsm. r=mconley.
Merge fx-team to m-c