Merge pull request #4377 from rabbitmq/loic-fix-cq-upgrade-3.10

Fix next_seq_id value when none is found in terms

Author: michaelklishin

deps/rabbit/src/rabbit_variable_queue.erl

@@ -1788,7 +1788,7 @@ init(QueueVsn, IsDurable, IndexMod, IndexState, StoreState, DeltaCount, DeltaByt
         case Terms of
             non_clean_shutdown -> {HiSeqId, HiSeqId, DeltaCount, DeltaBytes};
             _                  -> NextSeqId0 = proplists:get_value(next_seq_id,
-                                                                   Terms, 0),
+                                                                   Terms, HiSeqId),
                                   {NextSeqId0,
                                    proplists:get_value(next_deliver_seq_id,
                                                        Terms, NextSeqId0),