Bug 960939 - Improve error when using sync time with b2g and no wifi settings file. r=wlach
Remove dump of testinfo;r=me
Bug 960063 - Make sure we don't try to have two concurrent marionette sessions;r=davehunt