Make instance restart block until services are back up

Also drop the somewhat hacky delay we had in the "restart"
function of the testing framework since it's no longer needed
(before this, sometimes the fixed delay would be insufficient
for a slower machine to complete the restart, causing a false
positive TC failure when the post-restart TC tried to run even
though Critic had not fully started yet.)