Fix flake(s) in rabbit_fifo_int_SUITE

The start_cluster helper used the same UID (!!) for all members
in the local cluster. This resulted in shared mem tables and
all sorts of havoc.

(cherry picked from commit 1d9f179)
(cherry picked from commit 7899349)

# Conflicts:
#	deps/rabbit/test/rabbit_fifo_int_SUITE.erl

Author: kjnilsson

deps/rabbit/test/rabbit_fifo_int_SUITE.erl

@@ -938,10 +938,26 @@ discard_next_delivery(ClusterName, State0, Wait) ->
     end.
 
 start_cluster(ClusterName, ServerIds, RaFifoConfig) ->
+<<<<<<< HEAD
     {ok, Started, _} = ra:start_cluster(?RA_SYSTEM,
                                         ClusterName#resource.name,
                                         {module, rabbit_fifo, RaFifoConfig},
                                         ServerIds),
+=======
+    NameBin = ra_lib:to_binary(ClusterName#resource.name),
+    Confs = [begin
+                 UId = ra:new_uid(NameBin),
+                 #{id => Id,
+                   uid => UId,
+                   cluster_name => ClusterName#resource.name,
+                   log_init_args => #{uid => UId},
+                   initial_members => ServerIds,
+                   initial_machine_version => rabbit_fifo:version(),
+                   machine => {module, rabbit_fifo, RaFifoConfig}}
+             end
+             || Id <- ServerIds],
+    {ok, Started, _} = ra:start_cluster(?RA_SYSTEM, Confs),
+>>>>>>> 789934958 (Fix flake(s) in rabbit_fifo_int_SUITE)
     ?assertEqual(length(Started), length(ServerIds)),
     ok.