Support HA Rabbit Queue Configurations

Change-Id: I75f3f52a17ff828639994256264b2501f9b6f8ce
Merge branch 'test'