Carry oslo-incubator review #34949.

This adds support for AMQP heartbeats.

Change-Id: I4a6720f514d72611fc52fcf4538283b4e217c00b