Fixing broker extended tests
Merge pull request #4066 from abhgupta/abhgupta-dev

Merged by openshift-bot