Fix compile failures

This change fixes the compile failures caused by the upgrade to
spring-cloud 0.9.10.  This fixes the change of the RabbitServiceInfo
to the AmqpServiceInfo.

[#70929018]
Merge 70929018-spring-cloud-update to master

[Completes #70929018]