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

Yeah. Because there is a strong dependency on the other code. That's why there are TWO commits in this. Trying to get ahead of things.