[BROOKLYN-92] Support for brokerName. Changes suggested by PR reviewer