Bug 1035277 - Add option to not restart b2g....

Now that the other PR has landed, this will be gone from this PR.