Add RMQ_PORT and HAVANA support

Change-Id: I298a27a3833adef977acbdb977c786244ba5ec2f