Initial attempt at changing message.
Merge remote branch 'upstream/master' into improve_shutdown_msg
Merge pull request #1290 from arjclark/improve_shutdown_msg

Improve "already running shutdown.." message