Handle AMQP Host override if specified in testbed.py

Change-Id: I3a972a616e95859c4f6cbb5027d94b41e2a5ecc3
Merge remote-tracking branch 'upstream/master'