wait_for_terminal_state(): should only set timer if $timeout > 0; wait_for_snapshots() was broken due to $timeout=0