Refactor AMQP message broker selection

Drop redundant variable, make code more clean.

Partial-Bug: #1261631

Change-Id: I5fd71ce3bcd3a82839204ee1fb130de3a3e1d3ac
Merge "Refactor AMQP message broker selection"