Fixing broker extended
Merge pull request #3785 from danmcp/master

Merged by openshift-bot