Only raise unexpected output error for restart

Upstart's reload doesn't emit anything so the check for output will
always fail, even when successful.
Remove lingering TODOs