Backport rabbitmq waits and retries

Change-Id: Idb4cb73e17bc5035f22e26a5194c5af7ef74414f
Related-Bug: 1394188
Merge "Backport rabbitmq waits and retries"