Fix bug 1367031 - Add the new config's after upgrading and restoring the old config.global.js.

Change-Id: I469955d5f7e8253235cb44f566c551f5a7bac2b2
Handle AMQP Host override if specified in testbed.py

Change-Id: I3a972a616e95859c4f6cbb5027d94b41e2a5ecc3
Merge "Handle AMQP Host override if specified in testbed.py" into R1.10