[1373264 - Accomodating rabbitmq changes from fab]

Change-Id: I1b76fec086bb8cca5c0533983482192c026c792f