manual cherry-pick for conf tests timeouts and parallelism (#639)

Author: gabo1208

Makefile

@@ -389,7 +389,7 @@ _test-conformance:
 	BROKER_TEMPLATES=$(BROKER_TEMPLATES) \
 	BROKER_CLASS=RabbitMQBroker \
 	go test -v -tags=e2e \
-		-count=1 -parallel=12 -timeout=20m \
+		-count=1 -parallel=8 -timeout=1h \
 		-run TestBrokerConformance $(CURDIR)/test/conformance/...
 
 .PHONY: test-conformance