refactor reboots

Reboot has been done by the upstart/init scripts automatically. This was
not obvious, so I'm inlining the reboots.