Bug 1030935 - Measure default application setting in telemetry r=nalexander
Bug 1048387 r=snorp
Bug 1055022 - unselect runtimeApps on disconnect. r=jryans
Backed out changeset b17854552298 (bug 1042252) for intermittent test failures
Merge latest green fx-team changeset and mozilla-central; a=merge