cleanup
cleanup
Fix broker extended
Merge pull request #3501 from danmcp/master

Merged by openshift-bot