Bug 949454 - Use proper xre.zip on osx in marionette script, r=aki
Bug 949308 - Add the magic cookie for signaling a failure, r=philor

--HG--
extra : rebase_source : 08490e9bb29a44afe61418c94d3da79da33f4b0d