Bug 846133 - Store FHR state in a file; r=rnewman

Preferences aren't robust. So, we're using a file.
Merge central into services
Merge birch to m-c.
Backed out changeset dbf0c9f4a4b9 (bug 858416) for B2G mochitest-3 failures.