Revert "Sync latest rpc changes from oslo-incubator"

Fixes bug #1200069

Looks like there's a serious issue with the kombu heartbeat implementation.

This reverts commit 386a8c21ec6acbaa059eabd166dbf7feea2fad7d

Change-Id: I354f5e3c5af110542a3c25d117b14e7be02f169b
Merge "Revert "Sync latest rpc changes from oslo-incubator""