Bug 854018 - Record counts for FHR upload actions; r=rnewman
Bug 860094 - Remove saving of last payload to disk; r=rnewman
Merge mozilla-central into services