Fix for broker extended tests
Merge pull request #1241 from abhgupta/abhgupta-dev

Merged by openshift-bot