Speeding up broker tests
Merge pull request #4783 from danmcp/master

Merged by openshift-bot