Fix broker extended
Merge pull request #4946 from danmcp/master

Merged by openshift-bot