Backport rabbitmq fix 4600 to stabilize CI

Change-Id: I190411f0f38b09465d62bcff767ed1a29545df17