[MERGE] Reverting shutdown messages tweaks as shutdown is corrected

Suspend and hibernate will reboot, but it's no big deal. Should we want this to be fixed properly, we should hide the shutdown / hibernate menu items within the sking stuff as its not supported.