Fixes issue #117 - msm restart properly says server message for restart,...

... not shutdown.

Also some minor cosmetic tweaks to make the code more consistent. I tested this in a basic fashion - did a restart, and indeed, got the right message afterwards.