Bug 829953 - Interact with FHR properly from about:healthreport; r=rnewman
bug 830418 - hide health report menu items if health report is disabled, r=rnewman
bug 830498 - fix hardcoded brand references in data choices prefpane, r=jaws
bug 830090 - Access key for Choose What I Share button in info bar is broken, r=gps
Bug 828149 - Cancel timer during application shutdown. r=rnewman
Bug 828149 - Enable Firefox Health Report on Linux; r=mconnor

We suspect the previous patch fixes the shutdown crash on Linux that
caused us to disable FHR on Linux.
Bug 830626 - Add HealthReportComponents.manifest to package manifest; r=trivial
Bug 825544: backout Bug 825544, Bug 825544, Bug 765192 and Bug 808035 to bring back the old .location=val behavior, r=bz
Merge mozilla-central into services-central