bug 856458 - Fixup metro mochitests r=mbrubeck,jimm

--HG--
extra : rebase_source : e42ab8c875d658b96a2795fb1a5316ba29922f23