Merge pull request #2 from hfiguiere/bug1027232

Bug 1027232 - Restart b2g r=gaye
Bug 1035277 - Add option to not restart b2g.