wait for service shutdown all the time, not just during restarts

Otherwise the init script will return before the service has fully stopped.