Bug 886231 - Rename datareporting_fhr_summary to reflect string change (follow-up from Bug 879558). r=trivial
Merge m-c to s-c
Bug 885572 - Fix upgrade_mercurial() in bootstrapper; r=khuey

DONTBUILD (NPOTB)

--HG--
extra : rebase_source : 3aa99eb3b3d2d273e4882779bb527ac96f757ef6