fixup! fixup! Tests for "Handle missing delivery marker in CQ v1 index"

(cherry picked from commit 8689f57)
(cherry picked from commit 74bb4c5)

# Conflicts:
#	deps/rabbit/BUILD.bazel
(cherry picked from commit 572c4ad)

Author: gomoripeti

deps/rabbit/BUILD.bazel

@@ -309,7 +309,11 @@ rabbitmq_integration_suite(
 rabbitmq_integration_suite(
     name = "classic_queue_prop_SUITE",
     size = "large",
+<<<<<<< HEAD
     shard_count = 5,
+=======
+    shard_count = 6,
+>>>>>>> 74bb4c57a6 (fixup! fixup! Tests for "Handle missing delivery marker in CQ v1 index")
     sharding_method = "case",
     deps = [
         "@proper//:erlang_app",