Bug 878677 - Part 2: Sync changes to support FormHistory.jsm. r=rnewman