Use shortname for rabbitmq config

Change-Id: I74389e5b19797273c8229c0c3390f7ade64e5c73
Merge "Use shortname for rabbitmq config" into R1.10