Enable HA on declared queues

Change-Id: I57a7ca13580a507f7a51c0ec7078f7f2eaef185e