Attempted crash fix
Bug fix.  Was not restarting with the correct servername.  Was appending a 1 to the end of it instead.
Merge remote-tracking branch 'origin/master' into ServerNameRestartFix