When catchUpTimeoutMillis is 0, we should skip doing catchup entirely

Currently if catchUpTimeoutMillis is 0, we enter primary catchup mode and set a timeout to fire immediately. This is unnecessary and confusing; under some conditions the system can enter primary catchup mode and actually catch up before the "immediate" timeout fires, due to locking and scheduling vagaries.