Cherry pick oslo rpc HA fixes

Get 2 commits from oslo-rpc fixing HA failover:
* Ia148baa6e1ec632789ac3621c85173c2c16f3918 (fixed HA failover, Qpid
 part)
* I67923cb024bbd143edc8edccf35b9b400df31eb3 (fixed HA failover, RabbitMQ
 part)
Closes-Bug: #1261631

Change-Id: I154a1e4230cf956e0d6a71a8e717866d0cd17a12