Merge branch 'avoid_new_broker_instances' into 'master'

Don't create new broker and producer instances

See merge request !14
1 job for master in 37 seconds (queued for 13 seconds)