Bug 838877 - Change FHR policy handling to permit direct pref modification. r=gps
Bug 838879 - Part 1: split HealthReporter and AbstractHealthReporter. r=gps
Merge m-c to s-c.
Bug 840177 - Part 5: Add observer notification for keyword searches; r=gavin

The intent is for this to be captured by Firefox Health Report.
Bug 840177 - Part 6: Record urlbar searches in Firefox Health Report; r=gavin
Merge mozilla-central to mozilla-inbound