Bug 1018955: Get rid of pause/resume button flicker when setting breakpoint;r=fitzgen
Bug 992309 - Don't leak gcli promise to other tests; r=mratcliffe
Bug 1015527 - Back/Forward navigation shouldn't break the Translation UI, r=felipe.
Bug 1022616 - mochitest chrome template uses broken path to SimpleTest.js, r=jmaher DONTBUILD because NPOTB

--HG--
extra : rebase_source : 5924ce540737491b5ad1baef3dda1c8256b4675b
Merge mozilla-central and fx-team
Merge fx-team to m-c. a=merge