Fix JS error in GaiaDataLayer.deleteAllSms()
Remove code which is no longer necessary with --restart option
Merge remote-tracking branch 'upstream/master'