Add broker-url and use in place of broker-host option, keep option for backwards compatibility (< 2.5) but remove from documentation.
Merge pull request #1 from weak/broker_url_replacement

Add broker-url and use in place of broker-host option